eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix
authorRoberto Sassu <roberto.sassu@polito.it>
Thu, 17 Mar 2011 11:48:50 +0000 (12:48 +0100)
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>
Mon, 28 Mar 2011 06:49:15 +0000 (01:49 -0500)
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>
fs/ecryptfs/keystore.c

index c1436cff6f2d77aa0776bb3dd4963868358a9770..4feb78c23651ae310e41381782cce0cf60ccc0c2 100644 (file)
@@ -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);