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>

diff --git a/include/linux/umh.h b/include/linux/umh.h
index 73173c4..244aff6 100644 (file)
--- a/include/linux/umh.h
+++ b/include/linux/umh.h
@@ -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);

diff --git a/kernel/umh.c b/kernel/umh.c
index 3e4e453..6ca2096 100644 (file)
--- 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;
        /*