Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-06-10 11:33:10 +0200
committerJiri Slaby <jslaby@suse.cz>2019-06-10 11:33:27 +0200
commit5fba04a0fee49164112791f468ff6fda779b3e4d (patch)
tree885ef627c52c4f158089f82e5dc4c7371ff05c38
parent5e220c527c3d48f3fa9583e50b95a85bd7f9f3a3 (diff)
kernel/signal.c: trace_signal_deliver when signal_group_exit
(git-fixes).
-rw-r--r--patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch b/patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch
new file mode 100644
index 0000000000..8fb312e9c8
--- /dev/null
+++ b/patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch
@@ -0,0 +1,47 @@
+From: Zhenliang Wei <weizhenliang@huawei.com>
+Date: Fri, 31 May 2019 22:30:52 -0700
+Subject: kernel/signal.c: trace_signal_deliver when signal_group_exit
+Git-commit: 98af37d624ed8c83f1953b1b6b2f6866011fc064
+Patch-mainline: v5.2-rc3
+References: git-fixes
+
+In the fixes commit, removing SIGKILL from each thread signal mask and
+executing "goto fatal" directly will skip the call to
+"trace_signal_deliver". At this point, the delivery tracking of the
+SIGKILL signal will be inaccurate.
+
+Therefore, we need to add trace_signal_deliver before "goto fatal" after
+executing sigdelset.
+
+Note: SEND_SIG_NOINFO matches the fact that SIGKILL doesn't have any info.
+
+Link: http://lkml.kernel.org/r/20190425025812.91424-1-weizhenliang@huawei.com
+Fixes: cf43a757fd4944 ("signal: Restore the stop PTRACE_EVENT_EXIT")
+Signed-off-by: Zhenliang Wei <weizhenliang@huawei.com>
+Reviewed-by: Christian Brauner <christian@brauner.io>
+Reviewed-by: Oleg Nesterov <oleg@redhat.com>
+Cc: Eric W. Biederman <ebiederm@xmission.com>
+Cc: Ivan Delalande <colona@arista.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Deepa Dinamani <deepa.kernel@gmail.com>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ kernel/signal.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -2257,6 +2257,8 @@ relock:
+ if (signal_group_exit(signal)) {
+ ksig->info.si_signo = signr = SIGKILL;
+ sigdelset(&current->pending.signal, SIGKILL);
++ trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO,
++ &sighand->action[SIGKILL - 1]);
+ recalc_sigpending();
+ goto fatal;
+ }
diff --git a/series.conf b/series.conf
index 2445078839..4a50aa072b 100644
--- a/series.conf
+++ b/series.conf
@@ -22292,6 +22292,7 @@
patches.suse/net-dsa-mv88e6xxx-fix-handling-of-upper-half-of-STAT.patch
patches.drm/0004-drm-etnaviv-lock-MMU-while-dumping-core.patch
patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch
+ patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch