|
@@ -214,7 +214,7 @@ static void umh_complete(struct subprocess_info *sub_info)
|
|
|
/*
|
|
|
* This is the task which runs the usermode application
|
|
|
*/
|
|
|
-static int ____call_usermodehelper(void *data)
|
|
|
+static int call_usermodehelper_exec_async(void *data)
|
|
|
{
|
|
|
struct subprocess_info *sub_info = data;
|
|
|
struct cred *new;
|
|
@@ -259,7 +259,10 @@ static int ____call_usermodehelper(void *data)
|
|
|
(const char __user *const __user *)sub_info->envp);
|
|
|
out:
|
|
|
sub_info->retval = retval;
|
|
|
- /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
|
|
|
+ /*
|
|
|
+ * call_usermodehelper_exec_sync() will call umh_complete
|
|
|
+ * if UHM_WAIT_PROC.
|
|
|
+ */
|
|
|
if (!(sub_info->wait & UMH_WAIT_PROC))
|
|
|
umh_complete(sub_info);
|
|
|
if (!retval)
|
|
@@ -268,14 +271,14 @@ out:
|
|
|
}
|
|
|
|
|
|
/* Keventd can't block, but this (a child) can. */
|
|
|
-static int wait_for_helper(void *data)
|
|
|
+static int call_usermodehelper_exec_sync(void *data)
|
|
|
{
|
|
|
struct subprocess_info *sub_info = data;
|
|
|
pid_t pid;
|
|
|
|
|
|
/* If SIGCLD is ignored sys_wait4 won't populate the status. */
|
|
|
kernel_sigaction(SIGCHLD, SIG_DFL);
|
|
|
- pid = kernel_thread(____call_usermodehelper, sub_info, SIGCHLD);
|
|
|
+ pid = kernel_thread(call_usermodehelper_exec_async, sub_info, SIGCHLD);
|
|
|
if (pid < 0) {
|
|
|
sub_info->retval = pid;
|
|
|
} else {
|
|
@@ -283,17 +286,18 @@ static int wait_for_helper(void *data)
|
|
|
/*
|
|
|
* Normally it is bogus to call wait4() from in-kernel because
|
|
|
* wait4() wants to write the exit code to a userspace address.
|
|
|
- * But wait_for_helper() always runs as keventd, and put_user()
|
|
|
- * to a kernel address works OK for kernel threads, due to their
|
|
|
- * having an mm_segment_t which spans the entire address space.
|
|
|
+ * But call_usermodehelper_exec_sync() always runs as keventd,
|
|
|
+ * and put_user() to a kernel address works OK for kernel
|
|
|
+ * threads, due to their having an mm_segment_t which spans the
|
|
|
+ * entire address space.
|
|
|
*
|
|
|
* Thus the __user pointer cast is valid here.
|
|
|
*/
|
|
|
sys_wait4(pid, (int __user *)&ret, 0, NULL);
|
|
|
|
|
|
/*
|
|
|
- * If ret is 0, either ____call_usermodehelper failed and the
|
|
|
- * real error code is already in sub_info->retval or
|
|
|
+ * If ret is 0, either call_usermodehelper_exec_async failed and
|
|
|
+ * the real error code is already in sub_info->retval or
|
|
|
* sub_info->retval is 0 anyway, so don't mess with it then.
|
|
|
*/
|
|
|
if (ret)
|
|
@@ -305,17 +309,17 @@ static int wait_for_helper(void *data)
|
|
|
}
|
|
|
|
|
|
/* This is run by khelper thread */
|
|
|
-static void __call_usermodehelper(struct work_struct *work)
|
|
|
+static void call_usermodehelper_exec_work(struct work_struct *work)
|
|
|
{
|
|
|
struct subprocess_info *sub_info =
|
|
|
container_of(work, struct subprocess_info, work);
|
|
|
pid_t pid;
|
|
|
|
|
|
if (sub_info->wait & UMH_WAIT_PROC)
|
|
|
- pid = kernel_thread(wait_for_helper, sub_info,
|
|
|
+ pid = kernel_thread(call_usermodehelper_exec_sync, sub_info,
|
|
|
CLONE_FS | CLONE_FILES | SIGCHLD);
|
|
|
else
|
|
|
- pid = kernel_thread(____call_usermodehelper, sub_info,
|
|
|
+ pid = kernel_thread(call_usermodehelper_exec_async, sub_info,
|
|
|
SIGCHLD);
|
|
|
|
|
|
if (pid < 0) {
|
|
@@ -510,7 +514,7 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
|
|
|
if (!sub_info)
|
|
|
goto out;
|
|
|
|
|
|
- INIT_WORK(&sub_info->work, __call_usermodehelper);
|
|
|
+ INIT_WORK(&sub_info->work, call_usermodehelper_exec_work);
|
|
|
sub_info->path = path;
|
|
|
sub_info->argv = argv;
|
|
|
sub_info->envp = envp;
|