diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2019-09-12 12:49:56 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-13 16:59:51 -0300 |
| commit | 75c66515e4fea4e9bb488b6125e014220f846c61 (patch) | |
| tree | a7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167 /kernel/signal.c | |
| parent | IB/iser: Support up to 16MB data transfer in a single command (diff) | |
| parent | Linux 5.3-rc8 (diff) | |
| download | linux-dev-75c66515e4fea4e9bb488b6125e014220f846c61.tar.xz linux-dev-75c66515e4fea4e9bb488b6125e014220f846c61.zip | |
Merge tag 'v5.3-rc8' into rdma.git for-next
To resolve dependencies in following patches
mlx5_ib.h conflict resolved by keeing both hunks
Linux 5.3-rc8
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index e667be6907d7..534fec266a33 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -90,6 +90,11 @@ static bool sig_task_ignored(struct task_struct *t, int sig, bool force) handler == SIG_DFL && !(force && sig_kernel_only(sig))) return true; + /* Only allow kernel generated signals to this kthread */ + if (unlikely((t->flags & PF_KTHREAD) && + (handler == SIG_KTHREAD_KERNEL) && !force)) + return true; + return sig_handler_ignored(handler, sig); } |