Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-19 07:34:39 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-19 07:34:39 +0100
commit08d03457aa642c82543eca6014d7c1a89c053245 (patch)
treebeb6135e665d073a83781010d4933fadfdb26d29
parent4c06520b7c1e9ac2f5d9f4bf0d78cb5cbfb998e3 (diff)
Revert "signal: Always notice exiting tasks" (strace
threads-execve regression).
-rw-r--r--patches.suse/revert-signal-Always-notice-exiting-tasks.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.suse/revert-signal-Always-notice-exiting-tasks.patch b/patches.suse/revert-signal-Always-notice-exiting-tasks.patch
new file mode 100644
index 0000000000..298dc8b0b0
--- /dev/null
+++ b/patches.suse/revert-signal-Always-notice-exiting-tasks.patch
@@ -0,0 +1,38 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 19 Feb 2019 07:31:53 +0100
+Subject: Revert "signal: Always notice exiting tasks"
+Patch-mainline: not yet, under discussion
+References: strace threads-execve regression
+
+This reverts commit 1ab370e1385374f99386267d63a7af062ba06bd1, upstream
+commit 35634ffa1751b6efd8cf75010b509dcb0263e29b as it breaks strace.
+See:
+https://github.com/strace/strace/commit/2a50278b9#commitcomment-32367006
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ kernel/signal.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -2435,11 +2435,6 @@ relock:
+ goto relock;
+ }
+
+- /* Has this task already been marked for death? */
+- ksig->info.si_signo = signr = SIGKILL;
+- if (signal_group_exit(signal))
+- goto fatal;
+-
+ for (;;) {
+ struct k_sigaction *ka;
+
+@@ -2543,7 +2538,6 @@ relock:
+ continue;
+ }
+
+- fatal:
+ spin_unlock_irq(&sighand->siglock);
+
+ /*
diff --git a/series.conf b/series.conf
index 72b84c01f3..8eb5b940f1 100644
--- a/series.conf
+++ b/series.conf
@@ -1188,6 +1188,7 @@
# Scheduler / Core
########################################################
patches.suse/setuid-dumpable-wrongdir
+ patches.suse/revert-signal-Always-notice-exiting-tasks.patch
patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch
patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch