Skip to content

Commit 8099b04

Browse files
oleg-nesterovtorvalds
authored andcommitted
exec: load_script: don't blindly truncate shebang string
load_script() simply truncates bprm->buf and this is very wrong if the length of shebang string exceeds BINPRM_BUF_SIZE-2. This can silently truncate i_arg or (worse) we can execute the wrong binary if buf[2:126] happens to be the valid executable path. Change load_script() to return ENOEXEC if it can't find '\n' or zero in bprm->buf. Note that '\0' can come from either prepare_binprm()->memset() or from kernel_read(), we do not care. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Oleg Nesterov <[email protected]> Acked-by: Kees Cook <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Ben Woodard <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent fb5bf31 commit 8099b04

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

fs/binfmt_script.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,14 @@ static int load_script(struct linux_binprm *bprm)
4242
fput(bprm->file);
4343
bprm->file = NULL;
4444

45-
bprm->buf[BINPRM_BUF_SIZE - 1] = '\0';
46-
if ((cp = strchr(bprm->buf, '\n')) == NULL)
47-
cp = bprm->buf+BINPRM_BUF_SIZE-1;
45+
for (cp = bprm->buf+2;; cp++) {
46+
if (cp >= bprm->buf + BINPRM_BUF_SIZE)
47+
return -ENOEXEC;
48+
if (!*cp || (*cp == '\n'))
49+
break;
50+
}
4851
*cp = '\0';
52+
4953
while (cp > bprm->buf) {
5054
cp--;
5155
if ((*cp == ' ') || (*cp == '\t'))

0 commit comments

Comments
 (0)