summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPhil Chang <phil.chang@mediatek.com>2024-06-10 21:31:36 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-09-04 13:14:58 +0200
commit9d72b629a9413533397e516bec9261cdf331870e (patch)
tree26481e14a980cbfc41781ee14c42241dd10355b1 /kernel
parentee440c8312a63c11bfa9f09d16725312f75805c7 (diff)
downloadlinux-9d72b629a9413533397e516bec9261cdf331870e.tar.gz
linux-9d72b629a9413533397e516bec9261cdf331870e.tar.bz2
linux-9d72b629a9413533397e516bec9261cdf331870e.zip
hrtimer: Prevent queuing of hrtimer without a function callback
[ Upstream commit 5a830bbce3af16833fe0092dec47b6dd30279825 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/hrtimer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 1b301dd1692b..2e4f136bdf6a 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1183,6 +1183,8 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
struct hrtimer_clock_base *base;
unsigned long flags;
+ if (WARN_ON_ONCE(!timer->function))
+ return;
/*
* Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft
* match on CONFIG_PREEMPT_RT = n. With PREEMPT_RT check the hard