From f306d65117b41c8cbe0289746db9e6d5b35d2de2 Mon Sep 17 00:00:00 2001 From: Roberto Sassu Date: Wed, 6 Oct 2010 18:31:15 +0200 Subject: [PATCH] --- yaml --- r: 220928 b: refs/heads/master c: 39fac853a758306285404368fbe392408057b136 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/keystore.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f11bbc5bc509..6b99a8c1d468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aee683b9e77e17237b0e146025c3d363c9203634 +refs/heads/master: 39fac853a758306285404368fbe392408057b136 diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c index b85c6a7770a8..e7f029f00c6b 100644 --- a/trunk/fs/ecryptfs/keystore.c +++ b/trunk/fs/ecryptfs/keystore.c @@ -1819,11 +1819,11 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, rc = -EINVAL; goto out_wipe_list; } - ecryptfs_find_auth_tok_for_sig(&auth_tok_key, + rc = ecryptfs_find_auth_tok_for_sig(&auth_tok_key, &matching_auth_tok, crypt_stat->mount_crypt_stat, candidate_auth_tok_sig); - if (matching_auth_tok) { + if (!rc) { found_auth_tok = 1; goto found_matching_auth_tok; }