| Date | Wed, 13 Apr 2011 08:50:35 -0700 | From | Greg KH <> | Subject | [11/74] eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix |
| |
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Roberto Sassu <roberto.sassu@polito.it>
commit 1821df040ac3cd6a57518739f345da6d50ea9d3f upstream.
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> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- fs/ecryptfs/keystore.c | 1 + 1 file changed, 1 insertion(+)
--- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -1542,6 +1542,7 @@ int ecryptfs_keyring_auth_tok_for_sig(st 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);
|