Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 907ed132 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Linus Torvalds
Browse files

usermodehelper: split remaining calls to call_usermodehelper_fns() 



These are the only users of call_usermodehelper_fns().  This function
suffers from not being able to determine if the cleanup is called.  Even
if in this places the cleanup pointer is NULL, convert them to use the
separate call_usermodehelper_setup() + call_usermodehelper_exec()
functions so we can remove the _fns variant.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tejun Heo <tj@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb96c475

fs/coredump.c

+9 −3
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ void do_coredump(siginfo_t *siginfo) 
	if (ispipe) {

		int dump_count;

		char **helper_argv;

		struct subprocess_info *sub_info;



		if (ispipe < 0) {

			printk(KERN_WARNING "format_corename failed\n");
@@ -571,9 +572,14 @@ void do_coredump(siginfo_t *siginfo) 
			goto fail_dropcount;

		}



		retval = call_usermodehelper_fns(helper_argv[0], helper_argv,

					NULL, UMH_WAIT_EXEC, umh_pipe_setup,

					NULL, &cprm);

		retval = -ENOMEM;

		sub_info = call_usermodehelper_setup(helper_argv[0],

						helper_argv, NULL, GFP_KERNEL,

						umh_pipe_setup, NULL, &cprm);

		if (sub_info)

			retval = call_usermodehelper_exec(sub_info,

							  UMH_WAIT_EXEC);



		argv_free(helper_argv);

		if (retval) {

			printk(KERN_INFO "Core dump to %s pipe failed\n",

init/do_mounts_initrd.c

+6 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new) 


static void __init handle_initrd(void)

{

	struct subprocess_info *info;

	static char *argv[] = { "linuxrc", NULL, };

	extern char *envp_init[];

	int error;
@@ -70,8 +71,11 @@ static void __init handle_initrd(void) 
	 */

	current->flags |= PF_FREEZER_SKIP;



	call_usermodehelper_fns("/linuxrc", argv, envp_init, UMH_WAIT_PROC,

			init_linuxrc, NULL, NULL);

	info = call_usermodehelper_setup("/linuxrc", argv, envp_init,

					 GFP_KERNEL, init_linuxrc, NULL, NULL);

	if (!info)

		return;

	call_usermodehelper_exec(info, UMH_WAIT_PROC);



	current->flags &= ~PF_FREEZER_SKIP;