Skip to content

Commit

Permalink
usermodehelper: use UMH_WAIT_PROC consistently
Browse files Browse the repository at this point in the history
A few call_usermodehelper() callers use the hardcoded constant instead of
the proper UMH_WAIT_PROC, fix them.

Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: Oleg 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
oleg-nesterov authored and torvalds committed Mar 23, 2012
1 parent a02d6fd commit 70834d3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/block/drbd/drbd_nl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8187se/r8180_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/uvesafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion security/tomoyo/load_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit 70834d3

Please sign in to comment.