From 035ba50196cc320d81f598e47d9f8f1d28bc479e Mon Sep 17 00:00:00 2001 From: Roberto Sassu Date: Thu, 17 Mar 2011 12:48:50 +0100 Subject: [PATCH] --- yaml --- r: 243190 b: refs/heads/master c: 1821df040ac3cd6a57518739f345da6d50ea9d3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/keystore.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0985e4a53f91..ef23fed35c67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50f198ae16ac66508d4b8d5a40967a8507ad19ee +refs/heads/master: 1821df040ac3cd6a57518739f345da6d50ea9d3f diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c index c1436cff6f2d..4feb78c23651 100644 --- a/trunk/fs/ecryptfs/keystore.c +++ b/trunk/fs/ecryptfs/keystore.c @@ -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);