exec: load_script: Allow interpreter argument truncation
Subsystems (2)
PATCH v2 1/1 exec: load_script: Allow interpreter argument truncation
While we want to make sure the kernel doesn't attempt to execute a truncated interpreter path, we must allow the interpreter arguments to be truncated. Perl, for example, will re-read the script itself to parse arguments correctly.
This documents the parsing steps, and will fail to exec if the string was truncated with neither an end-of-line nor any trailing whitespace.
---
v2:
- fix 1-byte-too-early-bail-out in truncation detection (Oleg)
- add Samuel's "tested" tag
--- fs/binfmt_script.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-)
fs/binfmt_script.c +31 -6
@@ -20,6 +20,7 @@ static int load_script(struct linux_binprm *bprm)char *cp;struct file *file;int retval; +bool truncated = false, end_of_interp = false;if ((bprm->buf[0 ] !='#' ) || (bprm->buf[1 ] !='!' ))return -ENOEXEC ;
@@ -42,32 +43,56 @@ static int load_script(struct linux_binprm *bprm)fput (bprm->file); bprm->file =NULL ; +/* +* Truncating interpreter arguments is okay: the interpreter +* can re-read the script to parse them on its own. Truncating +* the interpreter path itself, though, is bad. Note truncation +* here, and check for either newline or start of arguments +* below. +*/ for (cp = bprm->buf+2 ;; cp++) { -if (cp >= bprm->buf +BINPRM_BUF_SIZE ) -return -ENOEXEC ; -if (!*cp || (*cp =='\n' )) +if (!*cp || (*cp =='\n' )) { + end_of_interp = true;break ; + } +if (cp == bprm->buf +BINPRM_BUF_SIZE -1 ) { + truncated = true; +break ; + } } *cp ='\0' ; +/* Truncate trailing whitespace */ while (cp > bprm->buf) { cp--; -if ((*cp ==' ' ) || (*cp =='\t' )) +if ((*cp ==' ' ) || (*cp =='\t' )) { + end_of_interp = true; *cp ='\0' ; -else + }else break ; } +/* Skip leading whitespace */ for (cp = bprm->buf+2 ; (*cp ==' ' ) || (*cp =='\t' ); cp++);if (*cp =='\0' )return -ENOEXEC ;/* No interpreter name found */ i_name = cp; i_arg =NULL ; +/* +* Skip until end of string or finding whitespace which +* signals the start of interpreter arguments. +*/ for ( ; *cp && (*cp !=' ' ) && (*cp !='\t' ); cp++)/* nothing */ ; -while ((*cp ==' ' ) || (*cp =='\t' )) +/* Truncate and skip any whitespace in front of arguments */ +while ((*cp ==' ' ) || (*cp =='\t' )) { + end_of_interp = true; *cp++ ='\0' ; + }if (*cp) i_arg = cp; +/* Fail exec if the name of the interpreter was cut off. */ +if (truncated && !end_of_interp) +return -ENOEXEC ;/* * OK, we've parsed out the interpreter name and * (optional) argument.
Signature · 5 lines
2.17.1 -- Kees Cook
Quoted 4 lines · Kees Cook
v2:
- fix 1-byte-too-early-bail-out in truncation detection (Oleg)
- add Samuel's "tested" tag
Looks correct...
but you know, I'll try to read this patch again tomorrow after sleep.
And I can't believe this code can't be simplified... but let me repeat that I tried and failed.
Oleg.
Quoted 3 lines · Kees Cook
This documents the parsing steps, and will fail to exec if the string was truncated with neither an end-of-line nor any trailing whitespace.
Is there any reason why we don't just revert 8099b047ecc4 ("exec:load_script: don't blindly truncate shebang string").
That revert patch would seem to be much simpler than this rather complicated thing.
Linus
Quoted 11 lines · Linus Torvalds
Quoted 3 lines · Kees Cook
This documents the parsing steps, and will fail to exec if the string was truncated with neither an end-of-line nor any trailing whitespace.
Is there any reason why we don't just revert
8099b047ecc4("exec:load_script: don't blindly truncate shebang string").That revert patch would seem to be much simpler than this rather complicated thing.
We certainly can, but we'll still need to fix the "don't exec a truncated interpreter path" problem (which this fixes).
I'm happy to do it as two steps instead: revert, then a separate fix to land in the merge window?
Signature · 1 line
Kees Cook
On Thu, Feb 14, 2019 at 10:10 AM Kees Cook <[email protected]> wrote:>
Quoted 5 lines
We certainly can, but we'll still need to fix the "don't exec a truncated interpreter path" problem (which this fixes).
I'm happy to do it as two steps instead: revert, then a separate fix to land in the merge window?
I think that's better. It should also be fairly easy: just look for whitespace in the truncated output (in the place where we already check for the "oh, we truncated")
It's even possible that somebody depends on a truncated interpreter executable name. Unlikely, but possiible. So I'd rather just revert, and re-try the smaller approach for 5.1.
Linus