diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index a0ba428954b6..b65879d4e08f 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -960,9 +960,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, | |||
960 | int from_ancestor_ns = 0; | 960 | int from_ancestor_ns = 0; |
961 | 961 | ||
962 | #ifdef CONFIG_PID_NS | 962 | #ifdef CONFIG_PID_NS |
963 | if (!is_si_special(info) && SI_FROMUSER(info) && | 963 | from_ancestor_ns = si_fromuser(info) && |
964 | task_pid_nr_ns(current, task_active_pid_ns(t)) <= 0) | 964 | !task_pid_nr_ns(current, task_active_pid_ns(t)); |
965 | from_ancestor_ns = 1; | ||
966 | #endif | 965 | #endif |
967 | 966 | ||
968 | return __send_signal(sig, info, t, group, from_ancestor_ns); | 967 | return __send_signal(sig, info, t, group, from_ancestor_ns); |