aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-16 19:01:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-16 19:01:23 -0700
commit5f3ab27b9eb7f1b97e6d4460ac4e494588e09f0c (patch)
tree5a4d734885994432b4aa1cd8686d7a920f065a51 /kernel
parent4c7b63a32d54850a31a00f22131db417face70e4 (diff)
parent05b289263772b0698589abc47771264a685cd365 (diff)
downloadtip-5f3ab27b9eb7f1b97e6d4460ac4e494588e09f0c.tar.gz
tip-5f3ab27b9eb7f1b97e6d4460ac4e494588e09f0c.tar.xz
tip-5f3ab27b9eb7f1b97e6d4460ac4e494588e09f0c.zip
Merge branch 'for-5.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "The cgroup2 freezer pulled in this cycle broke strace. This pull request includes a workaround for the problem. It's not a complete fix in that it may cause spurious frozen state flip-flops which is fairly minor. Will push a full fix once it's ready" * 'for-5.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: signal: unconditionally leave the frozen state in ptrace_stop()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/signal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index c4dd66436fc5..a1eb44dc9ff5 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2113,6 +2113,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t
preempt_enable_no_resched();
cgroup_enter_frozen();
freezable_schedule();
+ cgroup_leave_frozen(true);
} else {
/*
* By the time we got the lock, our tracer went away.