posix-timers: fix deletion race
PATCH 1/4 posix-timers: fix deletion race
From: Thomas Gleixner <[email protected]>
timer_delete does:lock_timer();timer->it_process = NULL;unlock_timer();release_posix_timer();
timer->it_process is checked in lock_timer() to prevent access to a timer, which is on the way to be deleted, but the check happens after idr_lock is dropped. This allows release_posix_timer() to delete the timer before the lock code can check the timer:
CPU 0 CPU 1lock_timer();timer->it_process = NULL;
unlock_timer(); lock_timer() spin_lock(idr_lock); timer = idr_find(); spin_lock(timer->lock); spin_unlock(idr_lock); release_posix_timer(); spin_lock(idr_lock); idr_remove(timer); spin_unlock(idr_lock); free_timer(timer); if (timer->......)
Change the locking to prevent this.
Signed-off-by Thomas Gleixner <[email protected]>
kernel/posix-timers.c renamed from kernel/posix-timers.c~1_THOMAS +4 -3
@@ -605,13 +605,14 @@ static struct k_itimer * lock_timer(time timr = (struct k_itimer *)idr_find (&posix_timers_id, (int ) timer_id);if (timr) {spin_lock (&timr->it_lock); -spin_unlock (&idr_lock);if ((timr->it_id != timer_id) || !(timr->it_process) || timr->it_process->tgid != current->tgid) { -unlock_timer (timr, *flags); +spin_unlock (&timr->it_lock); +spin_unlock_irqrestore (&idr_lock, *flags); timr =NULL ; - } + }else +spin_unlock (&idr_lock); }else spin_unlock_irqrestore (&idr_lock, *flags);