diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-07-13 20:06:48 +0300 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-07-21 16:24:52 +0300 |
| commit | be619f7f063a49c656f620a46af4f8ea3e759e91 (patch) | |
| tree | be0f257b8da82e9e2eb9bdaa2574a48221e7b516 /init/main.c | |
| parent | d8b9cd549ecf0f3dc8da42ada5f0ce73e8ed5f1e (diff) | |
| download | linux-be619f7f063a49c656f620a46af4f8ea3e759e91.tar.xz | |
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 'init/main.c')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 0ead83e86b5a..78ccec5c28f3 100644 --- a/init/main.c +++ b/init/main.c @@ -1329,9 +1329,7 @@ static int run_init_process(const char *init_filename) pr_debug(" with environment:\n"); for (p = envp_init; *p; p++) pr_debug(" %s\n", *p); - return do_execve(getname_kernel(init_filename), - (const char __user *const __user *)argv_init, - (const char __user *const __user *)envp_init); + return kernel_execve(init_filename, argv_init, envp_init); } static int try_to_run_init_process(const char *init_filename) |