aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-27 15:01:19 -0700
committerColin Cross <ccross@android.com>2011-10-27 15:01:19 -0700
commit2bb3e310159b65c88caf0c67a20ed257568be267 (patch)
treee4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5 /fs/exec.c
parent2f53cb72c1574d3880d9e88e254b756565fe2f6d (diff)
parent97596c34030ed28657ccafddb67e17a03890b90a (diff)
downloadkernel_samsung_tuna-2bb3e310159b65c88caf0c67a20ed257568be267.zip
kernel_samsung_tuna-2bb3e310159b65c88caf0c67a20ed257568be267.tar.gz
kernel_samsung_tuna-2bb3e310159b65c88caf0c67a20ed257568be267.tar.bz2
Merge commit 'v3.0.8' into android-3.0
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 6075a1e..044c13f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1411,6 +1411,8 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
printable(bprm->buf[2]) &&
printable(bprm->buf[3]))
break; /* -ENOEXEC */
+ if (try)
+ break; /* -ENOEXEC */
request_module("binfmt-%04x", *(unsigned short *)(&bprm->buf[2]));
#endif
}