Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 179394af authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

posix-timers: fix deletion race 



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 1

  lock_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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 928923c7

kernel/posix-timers.c

+4 −3
Original line number Diff line number Diff line
@@ -605,13 +605,14 @@ static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags) 
	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);