diff mbox series

[v2,15/15] umd: Stop using split_argv

Message ID 87sged3a9n.fsf_-_@x220.int.ebiederm.org (mailing list archive)
State New, archived
Headers show
Series Make the user mode driver code a better citizen | expand

Commit Message

Eric W. Biederman June 29, 2020, 8:08 p.m. UTC
There is exactly one argument so there is nothing to split.  All
split_argv does now is cause confusion and avoid the need for a cast
when passing a "const char *" string to call_usermodehelper_setup.

So avoid confusion and the possibility of an odd driver name causing
problems by just using a fixed argv array with a cast in the call to

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
 kernel/umd.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
diff mbox series


diff --git a/kernel/umd.c b/kernel/umd.c
index 4188b71de267..ff79fb16d738 100644
--- a/kernel/umd.c
+++ b/kernel/umd.c
@@ -160,27 +160,21 @@  static void umd_cleanup(struct subprocess_info *info)
 int fork_usermode_driver(struct umd_info *info)
 	struct subprocess_info *sub_info;
-	char **argv = NULL;
+	const char *argv[] = { info->driver_name, NULL };
 	int err;
 	if (WARN_ON_ONCE(info->tgid))
 		return -EBUSY;
 	err = -ENOMEM;
-	argv = argv_split(GFP_KERNEL, info->driver_name, NULL);
-	if (!argv)
-		goto out;
-	sub_info = call_usermodehelper_setup(info->driver_name, argv, NULL,
-					     GFP_KERNEL,
+	sub_info = call_usermodehelper_setup(info->driver_name,
+					     (char **)argv, NULL, GFP_KERNEL,
 					     umd_setup, umd_cleanup, info);
 	if (!sub_info)
 		goto out;
 	err = call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);
-	if (argv)
-		argv_free(argv);
 	return err;