diff --git a/[refs] b/[refs] index 3c1ac6e31a73..5950bb9db519 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aacb3d17a73f6447c04e4d769391238dcf85568d +refs/heads/master: 912193521b719fbfc2f16776febf5232fe8ba261 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 01829a1cb766..e6770a526f34 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -1440,6 +1440,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 }