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

Commit 70834d30 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

usermodehelper: use UMH_WAIT_PROC consistently 



A few call_usermodehelper() callers use the hardcoded constant instead of
the proper UMH_WAIT_PROC, fix them.

Reported-by: default avatarTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michal Januszewski <spock@gentoo.org>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Kentaro Takeda <takedakn@nttdata.co.jp>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a02d6fd6

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int drbd_khelper(struct drbd_conf *mdev, char *cmd) 
	dev_info(DEV, "helper command: %s %s %s\n", usermode_helper, cmd, mb);



	drbd_bcast_ev_helper(mdev, cmd);

	ret = call_usermodehelper(usermode_helper, argv, envp, 1);

	ret = call_usermodehelper(usermode_helper, argv, envp, UMH_WAIT_PROC);

	if (ret)

		dev_warn(DEV, "helper command: %s %s %s exit code %u (0x%x)\n",

				usermode_helper, cmd, mb,

drivers/staging/rtl8187se/r8180_core.c

+1 −1
Original line number Diff line number Diff line
@@ -4159,7 +4159,7 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work) 
		argv[0] = RadioPowerPath;

		argv[2] = NULL;



		call_usermodehelper(RadioPowerPath, argv, envp, 1);

		call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC);

	}

}

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static void dm_check_ac_dc_power(struct net_device *dev) 


	if (priv->rtllib->state != RTLLIB_LINKED)

		return;

	call_usermodehelper(ac_dc_check_script_path, argv, envp, 1);

	call_usermodehelper(ac_dc_check_script_path, argv, envp, UMH_WAIT_PROC);



	return;

};
@@ -2296,7 +2296,7 @@ void dm_CheckRfCtrlGPIO(void *data) 


		argv[0] = RadioPowerPath;

		argv[2] = NULL;

		call_usermodehelper(RadioPowerPath, argv, envp, 1);

		call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC);

	}

}

drivers/video/uvesafb.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int uvesafb_helper_start(void) 
		NULL,

	};



	return call_usermodehelper(v86d_path, argv, envp, 1);

	return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);

}



/*

security/tomoyo/load_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void tomoyo_load_policy(const char *filename) 
	envp[0] = "HOME=/";

	envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";

	envp[2] = NULL;

	call_usermodehelper(argv[0], argv, envp, 1);

	call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);

	tomoyo_check_profile();

}