diff options
author | John Stultz <john.stultz@linaro.org> | 2011-08-04 10:25:35 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-08-10 10:09:53 -0400 |
commit | 971c90bfa2f0b4fe52d6d9002178d547706f1343 (patch) | |
tree | f3075f495780a0ffc5d433ae7cb93aca8a40cf8e /kernel | |
parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) |
alarmtimers: Avoid possible null pointer traversal
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/alarmtimer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 59f369f98a04..1dee3f62a6a7 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c | |||
@@ -479,11 +479,8 @@ static int alarm_timer_set(struct k_itimer *timr, int flags, | |||
479 | if (!rtcdev) | 479 | if (!rtcdev) |
480 | return -ENOTSUPP; | 480 | return -ENOTSUPP; |
481 | 481 | ||
482 | /* Save old values */ | 482 | if (old_setting) |
483 | old_setting->it_interval = | 483 | alarm_timer_get(timr, old_setting); |
484 | ktime_to_timespec(timr->it.alarmtimer.period); | ||
485 | old_setting->it_value = | ||
486 | ktime_to_timespec(timr->it.alarmtimer.node.expires); | ||
487 | 484 | ||
488 | /* If the timer was already set, cancel it */ | 485 | /* If the timer was already set, cancel it */ |
489 | alarm_cancel(&timr->it.alarmtimer); | 486 | alarm_cancel(&timr->it.alarmtimer); |