Skip to content

Commit 2f3daa0

Browse files
oleg-nesterovgregkh
authored andcommitted
posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()
commit f90fff1 upstream. If an exiting non-autoreaping task has already passed exit_notify() and calls handle_posix_cpu_timers() from IRQ, it can be reaped by its parent or debugger right after unlock_task_sighand(). If a concurrent posix_cpu_timer_del() runs at that moment, it won't be able to detect timer->it.cpu.firing != 0: cpu_timer_task_rcu() and/or lock_task_sighand() will fail. Add the tsk->exit_state check into run_posix_cpu_timers() to fix this. This fix is not needed if CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y, because exit_task_work() is called before exit_notify(). But the check still makes sense, task_work_add(&tsk->posix_cputimers_work.work) will fail anyway in this case. Cc: stable@vger.kernel.org Reported-by: Benoît Sevens <bsevens@google.com> Fixes: 0bdd2ed ("sched: run_posix_cpu_timers: Don't check ->exit_state, use lock_task_sighand()") Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c8c4f0c commit 2f3daa0

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

kernel/time/posix-cpu-timers.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,6 +1431,15 @@ void run_posix_cpu_timers(void)
14311431

14321432
lockdep_assert_irqs_disabled();
14331433

1434+
/*
1435+
* Ensure that release_task(tsk) can't happen while
1436+
* handle_posix_cpu_timers() is running. Otherwise, a concurrent
1437+
* posix_cpu_timer_del() may fail to lock_task_sighand(tsk) and
1438+
* miss timer->it.cpu.firing != 0.
1439+
*/
1440+
if (tsk->exit_state)
1441+
return;
1442+
14341443
/*
14351444
* If the actual expiry is deferred to task work context and the
14361445
* work is already scheduled there is no point to do anything here.

0 commit comments

Comments
 (0)