Skip to content

Commit

Permalink
timers: Plug locking race vs. timer migration
Browse files Browse the repository at this point in the history
Linus noticed that lock_timer_base() lacks a READ_ONCE() for accessing the
timer flags. As a consequence the compiler is allowed to reload the flags
between the initial check for TIMER_MIGRATION and the following timer base
computation and the spin lock of the base.

While this has not been observed (yet), we need to make sure that it never
happens.

Fixes: 0eeda71 ("timer: Replace timer base by a cpu index")
Reported-by: Linus Torvalds <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1610241711220.4983@nanos
Cc: [email protected]
Cc: Andrew Morton <[email protected]>
Cc: Peter Zijlstra <[email protected]>
  • Loading branch information
KAGA-KOKO committed Oct 25, 2016
1 parent 07d9a38 commit b831275
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion kernel/time/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,14 @@ static struct timer_base *lock_timer_base(struct timer_list *timer,
{
for (;;) {
struct timer_base *base;
u32 tf = timer->flags;
u32 tf;

/*
* We need to use READ_ONCE() here, otherwise the compiler
* might re-read @tf between the check for TIMER_MIGRATING
* and spin_lock().
*/
tf = READ_ONCE(timer->flags);

if (!(tf & TIMER_MIGRATING)) {
base = get_timer_base(tf);
Expand Down

0 comments on commit b831275

Please sign in to comment.