Commit 21d59828 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

umh: Remove call_usermodehelper_setup_file. 

The only caller of call_usermodehelper_setup_file is fork_usermode_blob.
In fork_usermode_blob replace call_usermodehelper_setup_file with
call_usermodehelper_setup and delete fork_usermodehelper_setup_file.

For this to work the argv_free is moved from umh_clean_and_save_pid
to fork_usermode_blob.

v1: https://lkml.kernel.org/r/87zh8qf0mp.fsf_-_@x220.int.ebiederm.org
v2: https://lkml.kernel.org/r/87o8p163u1.fsf_-_@x220.int.ebiederm.org
Link: https://lkml.kernel.org/r/20200702164140.4468-4-ebiederm@xmission.com


Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Tested-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 3a171042

include/linux/umh.h

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ call_usermodehelper_setup(const char *path, char **argv, char **envp, 
			  int (*init)(struct subprocess_info *info, struct cred *new),

			  void (*cleanup)(struct subprocess_info *), void *data);



struct subprocess_info *call_usermodehelper_setup_file(struct file *file,

			  int (*init)(struct subprocess_info *info, struct cred *new),

			  void (*cleanup)(struct subprocess_info *), void *data);

struct umh_info {

	const char *cmdline;

	struct file *pipe_to_umh;

kernel/umh.c

+11 −31
Original line number Diff line number Diff line
@@ -402,33 +402,6 @@ struct subprocess_info *call_usermodehelper_setup(const char *path, char **argv, 
}

EXPORT_SYMBOL(call_usermodehelper_setup);



struct subprocess_info *call_usermodehelper_setup_file(struct file *file,

		int (*init)(struct subprocess_info *info, struct cred *new),

		void (*cleanup)(struct subprocess_info *info), void *data)

{

	struct subprocess_info *sub_info;

	struct umh_info *info = data;

	const char *cmdline = (info->cmdline) ? info->cmdline : "usermodehelper";



	sub_info = kzalloc(sizeof(struct subprocess_info), GFP_KERNEL);

	if (!sub_info)

		return NULL;



	sub_info->argv = argv_split(GFP_KERNEL, cmdline, NULL);

	if (!sub_info->argv) {

		kfree(sub_info);

		return NULL;

	}



	INIT_WORK(&sub_info->work, call_usermodehelper_exec_work);

	sub_info->path = "none";

	sub_info->file = file;

	sub_info->init = init;

	sub_info->cleanup = cleanup;

	sub_info->data = data;

	return sub_info;

}



static int umd_setup(struct subprocess_info *info, struct cred *new)

{

	struct umh_info *umh_info = info->data;
@@ -479,8 +452,6 @@ static void umd_cleanup(struct subprocess_info *info) 
		fput(umh_info->pipe_to_umh);

		fput(umh_info->pipe_from_umh);

	}



	argv_free(info->argv);

}



/**
@@ -501,7 +472,9 @@ static void umd_cleanup(struct subprocess_info *info) 
 */

int fork_usermode_blob(void *data, size_t len, struct umh_info *info)

{

	const char *cmdline = (info->cmdline) ? info->cmdline : "usermodehelper";

	struct subprocess_info *sub_info;

	char **argv = NULL;

	struct file *file;

	ssize_t written;

	loff_t pos = 0;
@@ -520,11 +493,16 @@ int fork_usermode_blob(void *data, size_t len, struct umh_info *info) 
	}



	err = -ENOMEM;

	sub_info = call_usermodehelper_setup_file(file, umd_setup, umd_cleanup,

						  info);

	argv = argv_split(GFP_KERNEL, cmdline, NULL);

	if (!argv)

		goto out;



	sub_info = call_usermodehelper_setup("none", argv, NULL, GFP_KERNEL,

					     umd_setup, umd_cleanup, info);

	if (!sub_info)

		goto out;



	sub_info->file = file;

	err = call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);

	if (!err) {

		mutex_lock(&umh_list_lock);
@@ -532,6 +510,8 @@ int fork_usermode_blob(void *data, size_t len, struct umh_info *info) 
		mutex_unlock(&umh_list_lock);

	}

out:

	if (argv)

		argv_free(argv);

	fput(file);

	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE