Commit 55e6074e authored Jun 25, 2020 by Eric W. Biederman

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>

parent e2dc9bf3

include/linux/umh.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ struct subprocess_info {
		const char *path;
		char **argv;
		char **envp;
		struct file *file;
		int wait;
		int retval;
		int (init)(struct subprocess_info info, struct cred *new);

kernel/umh.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -98,10 +98,6 @@ 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);

Admin message