Skip to contentSkip to conversation

potential null dereference in sysfs_override_clocksource()

DISCUSSION Dan Carpenter 2 participants 3 messages Jul 19, 2009 Timekeeping, clocksource core, NTP, alarmtimer

lore
Share & tools
lore
#0 lore raw

Hello,

I am testing a source checker (http://repo.or.cz/w/smatch.git).

It found an issue in sysfs_override_clocksource() from kernel/time/clocksource.c. If "len" is zero then "ovr" is null and checking ovr->flags will oops on line 517.

kernel/time/clocksource.c
516 if (tick_oneshot_mode_active() &&
517 !(ovr->flags & CLOCK_SOURCE_VALID_FOR_HRES)) {
518 printk(KERN_WARNING "%s clocksource is not HRT compatible. "

regards,
dan carpenter

#1 lore raw

Dan,

Quoted 4 lines · Dan Carpenter

Hello,

I am testing a source checker (http://repo.or.cz/w/smatch.git).

Quoted 8 lines

It found an issue in sysfs_override_clocksource() from kernel/time/clocksource.c. If "len" is zero then "ovr" is null and checking ovr->flags will oops on line 517.

kernel/time/clocksource.c
516 if (tick_oneshot_mode_active() &&
517 !(ovr->flags & CLOCK_SOURCE_VALID_FOR_HRES)) {
518 printk(KERN_WARNING "%s clocksource is not HRT compatible. "

Indeed. I queued a fix.

Thanks for pointing it out,

tglx

#2 lore raw

[tip:timers/urgent] clocksource: Prevent NULL pointer dereference

In reply to Dan Carpenter
Commit-ID:  79ef2bb01445400def20c7993b27fbcad27ca95f
Gitweb:     http://git.kernel.org/tip/79ef2bb01445400def20c7993b27fbcad27ca95f
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Sun, 19 Jul 2009 17:09:12 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Sun, 19 Jul 2009 17:15:54 +0200

clocksource: Prevent NULL pointer dereference

Writing a zero length string to sys/.../current_clocksource will cause a NULL pointer dereference if the clock events system is in one shot (highres or nohz) mode.

LKML-Reference: <alpine.DEB.2.00.0907191545580.12306@bicker>

---
 kernel/time/clocksource.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/time/clocksource.c +1 -1
index 592bf58..7466cb8 100644
@@ -513,7 +513,7 @@ static ssize_t sysfs_override_clocksource(struct sys_device *dev,
 	 * Check to make sure we don't switch to a non-highres capable
 	 * clocksource if the tick code is in oneshot mode (highres or nohz)
 	 */
-	if (tick_oneshot_mode_active() &&
+	if (tick_oneshot_mode_active() && ovr &&
 	    !(ovr->flags & CLOCK_SOURCE_VALID_FOR_HRES)) {
 		printk(KERN_WARNING "%s clocksource is not HRT compatible. "
 			"Cannot switch while in HRT/NOHZ mode\n", ovr->name);