diff options
| author | Roberto Sassu <roberto.sassu@polito.it> | 2011-03-17 12:48:50 +0100 |
|---|---|---|
| committer | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2011-03-28 01:49:15 -0500 |
| commit | 1821df040ac3cd6a57518739f345da6d50ea9d3f (patch) | |
| tree | ca353d7cdde5c3bcaa5d9657d8f20d124dbdd3cd /fs/ecryptfs | |
| parent | 50f198ae16ac66508d4b8d5a40967a8507ad19ee (diff) | |
| download | linux-3.10-1821df040ac3cd6a57518739f345da6d50ea9d3f.tar.gz linux-3.10-1821df040ac3cd6a57518739f345da6d50ea9d3f.tar.bz2 linux-3.10-1821df040ac3cd6a57518739f345da6d50ea9d3f.zip | |
eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix
The pointer '(*auth_tok_key)' is set to NULL in case request_key()
fails, in order to prevent its use by functions calling
ecryptfs_keyring_auth_tok_for_sig().
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Cc: <stable@kernel.org>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs')
| -rw-r--r-- | fs/ecryptfs/keystore.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index c1436cff6f2..4feb78c2365 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -1563,6 +1563,7 @@ int ecryptfs_keyring_auth_tok_for_sig(struct key **auth_tok_key, printk(KERN_ERR "Could not find key with description: [%s]\n", sig); rc = process_request_key_err(PTR_ERR(*auth_tok_key)); + (*auth_tok_key) = NULL; goto out; } (*auth_tok) = ecryptfs_get_key_payload_data(*auth_tok_key); |