diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-06-25 13:52:50 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-07-04 09:35:36 -0500 |
| commit | 55e6074e3fa67e1fb9ec140904db7e6cae6eda4b (patch) | |
| tree | 87649f10773735083637ad9794b74270b83d7786 /kernel/umh.c | |
| parent | e2dc9bf3f5275ca372001541e5f26af572976e65 (diff) | |
| download | linux-55e6074e3fa67e1fb9ec140904db7e6cae6eda4b.tar.gz linux-55e6074e3fa67e1fb9ec140904db7e6cae6eda4b.tar.bz2 linux-55e6074e3fa67e1fb9ec140904db7e6cae6eda4b.zip | |
umh: Stop calling do_execve_file
With the user mode driver code changed to not set subprocess_info.file
there are no more users of subproces_info.file. Remove this field
from struct subprocess_info and remove the only user in
call_usermodehelper_exec_async that would call do_execve_file instead
of do_execve if file was set.
v1: https://lkml.kernel.org/r/877dvuf0i7.fsf_-_@x220.int.ebiederm.org
v2: https://lkml.kernel.org/r/87r1tx4p2a.fsf_-_@x220.int.ebiederm.org
Link: https://lkml.kernel.org/r/20200702164140.4468-9-ebiederm@xmission.com
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Tested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/umh.c')
| -rw-r--r-- | kernel/umh.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/umh.c b/kernel/umh.c index 3e4e453d45c8..6ca2096298b9 100644 --- a/kernel/umh.c +++ b/kernel/umh.c @@ -98,13 +98,9 @@ static int call_usermodehelper_exec_async(void *data) commit_creds(new); - if (sub_info->file) - retval = do_execve_file(sub_info->file, - sub_info->argv, sub_info->envp); - else - retval = do_execve(getname_kernel(sub_info->path), - (const char __user *const __user *)sub_info->argv, - (const char __user *const __user *)sub_info->envp); + retval = do_execve(getname_kernel(sub_info->path), + (const char __user *const __user *)sub_info->argv, + (const char __user *const __user *)sub_info->envp); out: sub_info->retval = retval; /* |