diff options
author | Roberto Sassu <roberto.sassu@polito.it> | 2011-03-17 07:48:50 -0400 |
---|---|---|
committer | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2011-03-28 02:49:15 -0400 |
commit | 1821df040ac3cd6a57518739f345da6d50ea9d3f (patch) | |
tree | ca353d7cdde5c3bcaa5d9657d8f20d124dbdd3cd /fs/ecryptfs | |
parent | 50f198ae16ac66508d4b8d5a40967a8507ad19ee (diff) |
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 c1436cff6f2d..4feb78c23651 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, | |||
1563 | printk(KERN_ERR "Could not find key with description: [%s]\n", | 1563 | printk(KERN_ERR "Could not find key with description: [%s]\n", |
1564 | sig); | 1564 | sig); |
1565 | rc = process_request_key_err(PTR_ERR(*auth_tok_key)); | 1565 | rc = process_request_key_err(PTR_ERR(*auth_tok_key)); |
1566 | (*auth_tok_key) = NULL; | ||
1566 | goto out; | 1567 | goto out; |
1567 | } | 1568 | } |
1568 | (*auth_tok) = ecryptfs_get_key_payload_data(*auth_tok_key); | 1569 | (*auth_tok) = ecryptfs_get_key_payload_data(*auth_tok_key); |