diff options
author | Oleg Nesterov <oleg@redhat.com> | 2017-11-17 15:30:04 -0800 |
---|---|---|
committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-02-28 19:32:19 -0500 |
commit | 4cf13a3c65aa86297a56894f3d6a4638d3b123c5 (patch) | |
tree | 04204b03c8db38d0c5ec1f9d5e8356c3e6603021 /kernel | |
parent | d9f95f1f51bd9dc66e293628c9c4b91c260c32c3 (diff) |
kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
[ Upstream commit ac25385089f673560867eb5179228a44ade0cfc1 ]
Change sig_task_ignored() to drop the SIG_DFL && !sig_kernel_only()
signals even if force == T. This simplifies the next change and this
matches the same check in get_signal() which will drop these signals
anyway.
Link: http://lkml.kernel.org/r/20171103184227.GC21036@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Tested-by: Kyle Huey <me@kylehuey.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index cbb75358f7f5..4e61b75be17a 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -72,7 +72,7 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force) handler = sig_handler(t, sig); if (unlikely(t->signal->flags & SIGNAL_UNKILLABLE) && - handler == SIG_DFL && !force) + handler == SIG_DFL && !(force && sig_kernel_only(sig))) return 1; return sig_handler_ignored(handler, sig); |