diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2013-09-11 23:24:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 00:59:09 +0200 |
| commit | 6b3c538f5b2cfc53cb6803ec5001bbcf8f18a98e (patch) | |
| tree | 5a3dd78b655c93d7248facb2377be2630435b1fc /kernel | |
| parent | exec: don't retry if request_module() fails (diff) | |
| download | linux-6b3c538f5b2cfc53cb6803ec5001bbcf8f18a98e.tar.xz linux-6b3c538f5b2cfc53cb6803ec5001bbcf8f18a98e.zip | |
exec: cleanup the error handling in search_binary_handler()
The error hanling and ret-from-loop look confusing and inconsistent.
- "retval >= 0" simply returns
- "!bprm->file" returns too but with read_unlock() because
binfmt_lock was already re-acquired
- "retval != -ENOEXEC || bprm->mm == NULL" does "break" and
relies on the same check after the main loop
Consolidate these checks into a single if/return statement.
need_retry still checks "retval == -ENOEXEC", but this and -ENOENT before
the main loop are not needed. This is only for pathological and
impossible list_empty(&formats) case.
It is not clear why do we check "bprm->mm == NULL", probably this
should be removed.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Zach Levis <zml@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions