Skip to content

Commit 5a830bb

Browse files
Phil ChangKAGA-KOKO
authored andcommitted
hrtimer: Prevent queuing of hrtimer without a function callback
The hrtimer function callback must not be NULL. It has to be specified by the call side but it is not validated by the hrtimer code. When a hrtimer is queued without a function callback, the kernel crashes with a null pointer dereference when trying to execute the callback in __run_hrtimer(). Introduce a validation before queuing the hrtimer in hrtimer_start_range_ns(). [anna-maria: Rephrase commit message] Signed-off-by: Phil Chang <phil.chang@mediatek.com> Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
1 parent 6ba59ff commit 5a830bb

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

kernel/time/hrtimer.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,8 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
12851285
struct hrtimer_clock_base *base;
12861286
unsigned long flags;
12871287

1288+
if (WARN_ON_ONCE(!timer->function))
1289+
return;
12881290
/*
12891291
* Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft
12901292
* match on CONFIG_PREEMPT_RT = n. With PREEMPT_RT check the hard

0 commit comments

Comments
 (0)