ARM: 7839/1: entry: fix tracing of ARM-private syscalls

[~andy/linux] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index ba357e6aea9891b31cc6c738b440c6a14551bf93..8875dd10ae7ac77444db95e33c9fde83dde67512 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1399,26 +1399,22 @@ int search_binary_handler(struct linux_binprm *bprm)
                bprm->recursion_depth++;
                retval = fmt->load_binary(bprm);
                bprm->recursion_depth--;
-               if (retval >= 0) {
+               if (retval >= 0 || retval != -ENOEXEC ||
+                   bprm->mm == NULL || bprm->file == NULL) {
                        put_binfmt(fmt);
                        return retval;
                }
                read_lock(&binfmt_lock);
                put_binfmt(fmt);
-               if (retval != -ENOEXEC || bprm->mm == NULL)
-                       break;
-               if (!bprm->file) {
-                       read_unlock(&binfmt_lock);
-                       return retval;
-               }
        }
        read_unlock(&binfmt_lock);
 
-       if (need_retry && retval == -ENOEXEC && bprm->mm) {
+       if (need_retry && retval == -ENOEXEC) {
                if (printable(bprm->buf[0]) && printable(bprm->buf[1]) &&
                    printable(bprm->buf[2]) && printable(bprm->buf[3]))
                        return retval;
-               request_module("binfmt-%04x", *(ushort *)(bprm->buf + 2));
+               if (request_module("binfmt-%04x", *(ushort *)(bprm->buf + 2)) < 0)
+                       return retval;
                need_retry = false;
                goto retry;
        }