---

yaml --- r: 352833 b: refs/heads/master c: fe9453a h: refs/heads/master i: 352831: 1e7a4cd v: v3
git-mirror · Feb 21, 2013 · 44306a6 · 44306a6
1 parent 5a34ad6
commit 44306a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8
+refs/heads/master: fe9453a1dcb5fb146f9653267e78f4a558066f6f
diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c
@@ -367,6 +367,8 @@ key_ref_t search_my_process_keyrings(struct key_type *type,
 
 		switch (PTR_ERR(key_ref)) {
 		case -EAGAIN: /* no key */
+			if (ret)
+				break;
 		case -ENOKEY: /* negative key */
 			ret = key_ref;
 			break;