---

yaml
---
r: 198741
b: refs/heads/master
c: 7d64224
h: refs/heads/master
i:
  198739: 6464a23
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 363da4022c2753bf4b4b54a1bb9e4527fdcb9d5d
+refs/heads/master: 7d64224217b53b23243fd2aa428001486f2a5da5

trunk/kernel/kmod.c

@@ -175,16 +175,16 @@ static int wait_for_helper(void *data)
 	struct subprocess_info *sub_info = data;
 	pid_t pid;
 
-	/* Install a handler: if SIGCLD isn't handled sys_wait4 won't
-	 * populate the status, but will return -ECHILD. */
-	allow_signal(SIGCHLD);
+	/* If SIGCLD is ignored sys_wait4 won't populate the status. */
+	spin_lock_irq(&current->sighand->siglock);
+	current->sighand->action[SIGCHLD-1].sa.sa_handler = SIG_DFL;
+	spin_unlock_irq(&current->sighand->siglock);
 
 	pid = kernel_thread(____call_usermodehelper, sub_info, SIGCHLD);
 	if (pid < 0) {
 		sub_info->retval = pid;
 	} else {
-		int ret;
-
+		int ret = -ECHILD;
 		/*
 		 * Normally it is bogus to call wait4() from in-kernel because
 		 * wait4() wants to write the exit code to a userspace address.