summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-12-21 00:05:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-21 02:40:21 +0100
commite67eab39bee26f509d38d00ca1a8f24b63f46a31 (patch)
tree252072ae63bd5ecb8186242ace12e7df3a1311ad
parentsendfile: allows bypassing of notifier events (diff)
downloadlinux-e67eab39bee26f509d38d00ca1a8f24b63f46a31.tar.xz
linux-e67eab39bee26f509d38d00ca1a8f24b63f46a31.zip
keys: fix unreachable code
We set ret to NULL then test it. Remove the bogus test Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--security/keys/process_keys.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 58dfe0890947..20e4bf57aec8 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -367,8 +367,6 @@ 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;