lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alarmtimers: Avoid possible null pointer traversal

Browse Source 
We don't check if old_setting is non null before assigning it, so
correct this.

CC: Thomas Gleixner <tglx@linutronix.de>
CC: stable@kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
John Stultz
2011-08-04 07:25:35 -07:00
parent 322a8b0340
commit 971c90bfa2
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/time/alarmtimer.c
View File

@@ -479,11 +479,8 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
if (!rtcdev) if (!rtcdev)
return -ENOTSUPP; return -ENOTSUPP;
/* Save old values */ if (old_setting)
old_setting->it_interval = alarm_timer_get(timr, old_setting);
ktime_to_timespec(timr->it.alarmtimer.period);
old_setting->it_value =
ktime_to_timespec(timr->it.alarmtimer.node.expires);
/* If the timer was already set, cancel it */ /* If the timer was already set, cancel it */
alarm_cancel(&timr->it.alarmtimer); alarm_cancel(&timr->it.alarmtimer);