When get_pending detects the task has been marked to be killed we try to
clean up the SIGKLL by doing a sigdelset and recalc_sigpending, but we
still leave it in shared_pending. If the signal is being short circuit
delivered there is no need to put in shared_pending so this adds a check
in complete_signal.

This patch was modified from Eric Biederman <ebied...@xmission.com>
original patch.

Signed-off-by: Mike Christie <michael.chris...@oracle.com>
---
 kernel/signal.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kernel/signal.c b/kernel/signal.c
index 8f6330f0e9ca..3dc99b9aec7f 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1052,6 +1052,14 @@ static void complete_signal(int sig, struct task_struct 
*p, enum pid_type type)
                        signal->flags = SIGNAL_GROUP_EXIT;
                        signal->group_exit_code = sig;
                        signal->group_stop_count = 0;
+
+                       /*
+                        * The signal is being short circuit delivered so
+                        * don't set pending.
+                        */
+                       if (type != PIDTYPE_PID)
+                               sigdelset(&signal->shared_pending.signal, sig);
+
                        t = p;
                        do {
                                task_clear_jobctl_pending(t, 
JOBCTL_PENDING_MASK);
-- 
2.25.1

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to