Messages in this thread Patch in this message | | | Subject | [PATCH] KEYS: Revert one application of "Fix unreachable code" patch | From | David Howells <> | Date | Wed, 20 Feb 2013 12:24:32 +0000 |
| |
From: Alan Cox <alan@linux.intel.com>
A patch to fix some unreachable code in search_my_process_keyrings() got applied twice by two different routes upstream:
commit e67eab39bee26f509d38d00ca1a8f24b63f46a31 Author: Alan Cox <alan@linux.intel.com> Date: Thu Dec 20 15:05:54 2012 -0800 keys: fix unreachable code
and:
commit b010520ab3d2c05eb444ed5e01fe6c33842f597a Author: Alan Cox <alan@linux.intel.com> Date: Thu Oct 25 15:23:35 2012 +0100 keys: Fix unreachable code
Unfortunately, the second application removed something it shouldn't have and this wasn't detected by GIT. This is due to the patch not having sufficient lines of context to distinguish the two places of application.
So revert the second application of the patch.
Signed-off-by: David Howells <dhowells@redhat.com> cc: Jiri Kosina <jkosina@suse.cz> cc: Andrew Morton <akpm@linux-foundation.org> ---
security/keys/process_keys.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 20e4bf5..58dfe08 100644 --- a/security/keys/process_keys.c +++ b/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;
| |