diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-07-13 12:06:48 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-07-21 08:24:52 -0500 |
| commit | be619f7f063a49c656f620a46af4f8ea3e759e91 (patch) | |
| tree | be0f257b8da82e9e2eb9bdaa2574a48221e7b516 /include/linux/binfmts.h | |
| parent | d8b9cd549ecf0f3dc8da42ada5f0ce73e8ed5f1e (diff) | |
| download | linux-be619f7f063a49c656f620a46af4f8ea3e759e91.tar.gz | |
exec: Implement kernel_execve
To allow the kernel not to play games with set_fs to call exec
implement kernel_execve. The function kernel_execve takes pointers
into kernel memory and copies the values pointed to onto the new
userspace stack.
The calls with arguments from kernel space of do_execve are replaced
with calls to kernel_execve.
The calls do_execve and do_execveat are made static as there are now
no callers outside of exec.
The comments that mention do_execve are updated to refer to
kernel_execve or execve depending on the circumstances. In addition
to correcting the comments, this makes it easy to grep for do_execve
and verify it is not used.
Inspired-by: https://lkml.kernel.org/r/20200627072704.2447163-1-hch@lst.de
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/87wo365ikj.fsf@x220.int.ebiederm.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/binfmts.h')
| -rw-r--r-- | include/linux/binfmts.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 8e9e1b0c8eb83a..0571701ab1c57c 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -135,12 +135,7 @@ int copy_string_kernel(const char *arg, struct linux_binprm *bprm); extern void set_binfmt(struct linux_binfmt *new); extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t); -extern int do_execve(struct filename *, - const char __user * const __user *, - const char __user * const __user *); -extern int do_execveat(int, struct filename *, - const char __user * const __user *, - const char __user * const __user *, - int); +int kernel_execve(const char *filename, + const char *const *argv, const char *const *envp); #endif /* _LINUX_BINFMTS_H */ |