1 files changed, 9 insertions, 2 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index 9eac4db60eda..1921ffdc5e77 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -24,6 +24,9 @@
 #include <linux/signal.h>
 #include <linux/capability.h>
 #include <linux/freezer.h>
+#include <linux/pid_namespace.h>
+#include <linux/nsproxy.h>
+
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -1877,8 +1880,12 @@ relock:
                 if (sig_kernel_ignore(signr)) /* Default is nothing. */
                         continue;
 
-                /* Init gets no signals it doesn't want.  */
-                if (current == child_reaper)
+                /*
+                 * Init of a pid space gets no signals it doesn't want from
+                 * within that pid space. It can of course get signals from
+                 * its parent pid space.
+                 */
+                if (current == child_reaper(current))
                         continue;
 
                 if (sig_kernel_stop(signr)) {