Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4edf8bd authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Linus Torvalds
Browse files

exec: do not retry load_binary method if CONFIG_MODULES=n 



If CONFIG_MODULES=n, it makes no sense to retry the list of binary formats
handler because the list will not be modified by request_module().

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Richard Weinberger <richard@nod.at>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91219352

fs/exec.c

+4 −2
Original line number Diff line number Diff line
@@ -1430,9 +1430,9 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) 
			}

		}

		read_unlock(&binfmt_lock);

#ifdef CONFIG_MODULES

		if (retval != -ENOEXEC || bprm->mm == NULL) {

			break;

#ifdef CONFIG_MODULES

		} else {

#define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20<=(c) && (c)<=0x7e))

			if (printable(bprm->buf[0]) &&
@@ -1443,8 +1443,10 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) 
			if (try)

				break; /* -ENOEXEC */

			request_module("binfmt-%04x", *(unsigned short *)(&bprm->buf[2]));

#endif

		}

#else

		break;

#endif

	}

	return retval;

}