From 11e63aecec245a519980ff75c5dc9c189735a26a Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Date: Wed, 26 Aug 2009 01:54:56 -0500
Subject: [PATCH] --- yaml --- r: 166173 b: refs/heads/master c:
 3891959846709a19f76628e33478cd85edb0e79f h: refs/heads/master i:   166171:
 f0158419bfc46b8ebf9fbe38223b62c393171b83 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ecryptfs/keystore.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d19095130e25..80823aebad62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df6ad33ba1b9846bd5f0e2b9016c30c20bc2d948
+refs/heads/master: 3891959846709a19f76628e33478cd85edb0e79f
diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c
index 17164e483ab1..a0a7847567e9 100644
--- a/trunk/fs/ecryptfs/keystore.c
+++ b/trunk/fs/ecryptfs/keystore.c
@@ -416,7 +416,9 @@ ecryptfs_find_global_auth_tok_for_sig(
 			    &mount_crypt_stat->global_auth_tok_list,
 			    mount_crypt_stat_list) {
 		if (memcmp(walker->sig, sig, ECRYPTFS_SIG_SIZE_HEX) == 0) {
-			(*global_auth_tok) = walker;
+			rc = key_validate(walker->global_auth_tok_key);
+			if (!rc)
+				(*global_auth_tok) = walker;
 			goto out;
 		}
 	}