diff options
| author | Alan Cox | 2012-09-28 06:20:02 -0500 |
|---|---|---|
| committer | David Howells | 2012-09-28 06:20:02 -0500 |
| commit | 631527703d1aa2f0c5dc2af0d998f4da95c83f0e (patch) | |
| tree | a2aec36285e598c3f1c34aef166b242859bddb63 /security | |
| parent | bf5308344527d015ac9a6d2bda4ad4d40fd7d943 (diff) | |
| download | kernel-omap-631527703d1aa2f0c5dc2af0d998f4da95c83f0e.tar.gz kernel-omap-631527703d1aa2f0c5dc2af0d998f4da95c83f0e.tar.xz kernel-omap-631527703d1aa2f0c5dc2af0d998f4da95c83f0e.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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/process_keys.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 54339cfd6734..178b8c3b130a 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
| @@ -357,8 +357,6 @@ key_ref_t search_my_process_keyrings(struct key_type *type, | |||
| 357 | 357 | ||
| 358 | switch (PTR_ERR(key_ref)) { | 358 | switch (PTR_ERR(key_ref)) { |
| 359 | case -EAGAIN: /* no key */ | 359 | case -EAGAIN: /* no key */ |
| 360 | if (ret) | ||
| 361 | break; | ||
| 362 | case -ENOKEY: /* negative key */ | 360 | case -ENOKEY: /* negative key */ |
| 363 | ret = key_ref; | 361 | ret = key_ref; |
| 364 | break; | 362 | break; |