openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

exec: Move the call of prepare_binprm into search_binary_handler 

The code in prepare_binary_handler needs to be run every time
search_binary_handler is called so move the call into search_binary_handler
itself to make the code simpler and easier to understand.

Link: https://lkml.kernel.org/r/87d070zrvx.fsf_-_@x220.int.ebiederm.org
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: James Morris <jamorris@linux.microsoft.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2020-05-13 22:25:20 -05:00
parent a16b3357b2
commit 8b72ca9004
6 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/alpha/kernel/binfmt_loader.c
View File

@ -35,9 +35,6 @@ static int load_binary(struct linux_binprm *bprm)
bprm->file = file; bprm->file = file;
bprm->loader = loader; bprm->loader = loader;
retval = prepare_binprm(bprm);
if (retval < 0)
return retval;
return search_binary_handler(bprm); return search_binary_handler(bprm);
} }

4
fs/binfmt_em86.c
View File

@ -91,10 +91,6 @@ static int load_em86(struct linux_binprm *bprm)
bprm->file = file; bprm->file = file;
retval = prepare_binprm(bprm);
if (retval < 0)
return retval;
return search_binary_handler(bprm); return search_binary_handler(bprm);
} }

4
fs/binfmt_misc.c
View File

@ -221,10 +221,6 @@ static int load_misc_binary(struct linux_binprm *bprm)
if (fmt->flags & MISC_FMT_CREDENTIALS) if (fmt->flags & MISC_FMT_CREDENTIALS)
bprm->preserve_creds = 1; bprm->preserve_creds = 1;
retval = prepare_binprm(bprm);
if (retval < 0)
goto error;
retval = search_binary_handler(bprm); retval = search_binary_handler(bprm);
if (retval < 0) if (retval < 0)
goto error; goto error;

3
fs/binfmt_script.c
View File

@ -143,9 +143,6 @@ static int load_script(struct linux_binprm *bprm)
return PTR_ERR(file); return PTR_ERR(file);
bprm->file = file; bprm->file = file;
retval = prepare_binprm(bprm);
if (retval < 0)
return retval;
return search_binary_handler(bprm); return search_binary_handler(bprm);
} }

12
fs/exec.c
View File

@ -1629,7 +1629,7 @@ static void bprm_fill_uid(struct linux_binprm *bprm)
* *
* This may be called multiple times for binary chains (scripts for example). * This may be called multiple times for binary chains (scripts for example).
*/ */
int prepare_binprm(struct linux_binprm *bprm) static int prepare_binprm(struct linux_binprm *bprm)
{ {
loff_t pos = 0; loff_t pos = 0;
@ -1650,8 +1650,6 @@ int prepare_binprm(struct linux_binprm *bprm)
return kernel_read(bprm->file, bprm->buf, BINPRM_BUF_SIZE, &pos); return kernel_read(bprm->file, bprm->buf, BINPRM_BUF_SIZE, &pos);
} }
EXPORT_SYMBOL(prepare_binprm);
/* /*
* Arguments are '\0' separated strings found at the location bprm->p * Arguments are '\0' separated strings found at the location bprm->p
* points to; chop off the first by relocating brpm->p to right after * points to; chop off the first by relocating brpm->p to right after
@ -1707,6 +1705,10 @@ int search_binary_handler(struct linux_binprm *bprm)
if (bprm->recursion_depth > 5) if (bprm->recursion_depth > 5)
return -ELOOP; return -ELOOP;
retval = prepare_binprm(bprm);
if (retval < 0)
return retval;
retval = security_bprm_check(bprm); retval = security_bprm_check(bprm);
if (retval) if (retval)
return retval; return retval;
@ -1864,10 +1866,6 @@ static int __do_execve_file(int fd, struct filename *filename,
if (retval) if (retval)
goto out; goto out;
retval = prepare_binprm(bprm);
if (retval < 0)
goto out;
retval = copy_strings_kernel(1, &bprm->filename, bprm); retval = copy_strings_kernel(1, &bprm->filename, bprm);
if (retval < 0) if (retval < 0)
goto out; goto out;

1
include/linux/binfmts.h
View File

@ -116,7 +116,6 @@ static inline void insert_binfmt(struct linux_binfmt *fmt)
extern void unregister_binfmt(struct linux_binfmt *); extern void unregister_binfmt(struct linux_binfmt *);
extern int prepare_binprm(struct linux_binprm *);
extern int __must_check remove_arg_zero(struct linux_binprm *); extern int __must_check remove_arg_zero(struct linux_binprm *);
extern int search_binary_handler(struct linux_binprm *); extern int search_binary_handler(struct linux_binprm *);
extern int begin_new_exec(struct linux_binprm * bprm); extern int begin_new_exec(struct linux_binprm * bprm);