aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2010-10-06 12:31:15 -0400
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2010-10-29 11:31:36 -0400
commit39fac853a758306285404368fbe392408057b136 (patch)
tree920cc8e2ed51b568c6c63d15dfa98931f5926d04
parentaee683b9e77e17237b0e146025c3d363c9203634 (diff)
ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig()
This patch replaces the check of the 'matching_auth_tok' pointer with the exit status of ecryptfs_find_auth_tok_for_sig(). This avoids to use authentication tokens obtained through the function ecryptfs_keyring_auth_tok_for_sig which are not valid. Signed-off-by: Roberto Sassu <roberto.sassu@polito.it> Cc: Dustin Kirkland <kirkland@canonical.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
-rw-r--r--fs/ecryptfs/keystore.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index b85c6a7770a8..e7f029f00c6b 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1819,11 +1819,11 @@ find_next_matching_auth_tok:
1819 rc = -EINVAL; 1819 rc = -EINVAL;
1820 goto out_wipe_list; 1820 goto out_wipe_list;
1821 } 1821 }
1822 ecryptfs_find_auth_tok_for_sig(&auth_tok_key, 1822 rc = ecryptfs_find_auth_tok_for_sig(&auth_tok_key,
1823 &matching_auth_tok, 1823 &matching_auth_tok,
1824 crypt_stat->mount_crypt_stat, 1824 crypt_stat->mount_crypt_stat,
1825 candidate_auth_tok_sig); 1825 candidate_auth_tok_sig);
1826 if (matching_auth_tok) { 1826 if (!rc) {
1827 found_auth_tok = 1; 1827 found_auth_tok = 1;
1828 goto found_matching_auth_tok; 1828 goto found_matching_auth_tok;
1829 } 1829 }