2014-01-19 04:31:34

by Stefan Kristiansson

[permalink] [raw]
Subject: [PATCH] exec: remove redundant check in search_binary_handler()

retval >= 0 is implied by retval != -ENOEXEC

Signed-off-by: Stefan Kristiansson <[email protected]>
---
fs/exec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/exec.c b/fs/exec.c
index 7ea097f..aafafea 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1390,8 +1390,8 @@ int search_binary_handler(struct linux_binprm *bprm)
bprm->recursion_depth++;
retval = fmt->load_binary(bprm);
bprm->recursion_depth--;
- if (retval >= 0 || retval != -ENOEXEC ||
- bprm->mm == NULL || bprm->file == NULL) {
+ if (retval != -ENOEXEC || bprm->mm == NULL ||
+ bprm->file == NULL) {
put_binfmt(fmt);
return retval;
}
--
1.8.3.2