Commit 971c90bf authored by John Stultz's avatar John Stultz
Browse files

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: default avatarJohn Stultz <john.stultz@linaro.org>
parent 322a8b03

kernel/time/alarmtimer.c

+2 −5
Original line number Diff line number Diff line
@@ -479,11 +479,8 @@ static int alarm_timer_set(struct k_itimer *timr, int flags, 
	if (!rtcdev)

		return -ENOTSUPP;



	/* Save old values */

	old_setting->it_interval =

			ktime_to_timespec(timr->it.alarmtimer.period);

	old_setting->it_value =

			ktime_to_timespec(timr->it.alarmtimer.node.expires);

	if (old_setting)

		alarm_timer_get(timr, old_setting);



	/* If the timer was already set, cancel it */

	alarm_cancel(&timr->it.alarmtimer);