summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-08-04 16:51:56 +0200
committerJohn Stultz <john.stultz@linaro.org>2011-08-10 16:10:09 +0200
commitea7802f630d356acaf66b3c0b28c00a945fc35dc (patch)
tree9eb23fe08c124bfab7af964c3a4c614ac61c93aa
parentalarmtimers: Avoid possible null pointer traversal (diff)
downloadlinux-ea7802f630d356acaf66b3c0b28c00a945fc35dc.tar.xz
linux-ea7802f630d356acaf66b3c0b28c00a945fc35dc.zip
alarmtimers: Memset itimerspec passed into alarm_timer_get
Following common_timer_get, zero out the itimerspec passed in. CC: Thomas Gleixner <tglx@linutronix.de> CC: stable@kernel.org Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--kernel/time/alarmtimer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 1dee3f62a6a7..0e9263f6fd09 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -441,6 +441,8 @@ static int alarm_timer_create(struct k_itimer *new_timer)
static void alarm_timer_get(struct k_itimer *timr,
struct itimerspec *cur_setting)
{
+ memset(cur_setting, 0, sizeof(struct itimerspec));
+
cur_setting->it_interval =
ktime_to_timespec(timr->it.alarmtimer.period);
cur_setting->it_value =