Skip to content

Commit ef9d669

Browse files
committed
posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()
jira VULN-136690 jira VULN-136689 cve CVE-2025-38352 commit-author Oleg Nesterov <oleg@redhat.com> commit f90fff1 upstream-diff There where massive merge conflicts due several commits missing from upstream. Had to manually place and correct do to cherry-pick being extremely greedy with trying to pull changes from this LKML change set: https://lore.kernel.org/all/20200730101404.956367860@linutronix.de/ 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> (cherry picked from commit f90fff1) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent fbb8ea1 commit ef9d669

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

kernel/time/posix-cpu-timers.c

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

11231123
lockdep_assert_irqs_disabled();
11241124

1125+
/*
1126+
* Ensure that release_task(tsk) can't happen while
1127+
* handle_posix_cpu_timers() is running. Otherwise, a concurrent
1128+
* posix_cpu_timer_del() may fail to lock_task_sighand(tsk) and
1129+
* miss timer->it.cpu.firing != 0.
1130+
*/
1131+
if (tsk->exit_state)
1132+
return;
1133+
11251134
/*
11261135
* The fast path checks that there are no expired thread or thread
11271136
* group timers. If that's so, just return.

0 commit comments

Comments
 (0)