On 05/08, Roman Gushchin wrote: > > To resolve this problem, let's move cgroup_leave_frozen(true) call to > just after the fatal label. If the task is going to die, the frozen > bit must be cleared no matter how we get into this point.
OK, agreed, better than nothing. but please see my previous email. enter_frozen() in ptrace_stop() is not safe anyway. In fact somehow I thought it does leave_frozen(), iirc this was true in the earlier versions... > > Reported-by: kernel test robot <[email protected]> > Reported-by: Qian Cai <[email protected]> > Cc: Oleg Nesterov <[email protected]> > Cc: Tejun Heo <[email protected]> > Signed-off-by: Roman Gushchin <[email protected]> > --- > kernel/signal.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/kernel/signal.c b/kernel/signal.c > index 16b72f4f14df..8607b11ff936 100644 > --- a/kernel/signal.c > +++ b/kernel/signal.c > @@ -2483,10 +2483,6 @@ bool get_signal(struct ksignal *ksig) > ksig->info.si_signo = signr = SIGKILL; > sigdelset(¤t->pending.signal, SIGKILL); > recalc_sigpending(); > - current->jobctl &= ~JOBCTL_TRAP_FREEZE; > - spin_unlock_irq(&sighand->siglock); > - if (unlikely(cgroup_task_frozen(current))) > - cgroup_leave_frozen(true); > goto fatal; > } > > @@ -2608,8 +2604,10 @@ bool get_signal(struct ksignal *ksig) > continue; > } > > - spin_unlock_irq(&sighand->siglock); > fatal: > + spin_unlock_irq(&sighand->siglock); > + if (unlikely(cgroup_task_frozen(current))) > + cgroup_leave_frozen(true); > > /* > * Anything else is fatal, maybe with a core dump. > -- > 2.20.1 >
