summaryrefslogtreecommitdiffstats
path: root/kernel/time/posix-timers.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-05-30 23:15:51 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-04 15:40:28 +0200
commiteabdec04385376d560078992710104cc7be2ce1b (patch)
treeca24f482991666b523d9d0e4b11d3cdad304c676 /kernel/time/posix-timers.c
parentposix-timers: Make use of forward/remaining callbacks (diff)
downloadlinux-eabdec04385376d560078992710104cc7be2ce1b.tar.xz
linux-eabdec04385376d560078992710104cc7be2ce1b.zip
posix-timers: Zero settings value in common code
Zero out the settings struct in the common code so the callbacks do not have to do it themself. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: John Stultz <john.stultz@linaro.org> Link: http://lkml.kernel.org/r/20170530211657.200870713@linutronix.de
Diffstat (limited to '')
-rw-r--r--kernel/time/posix-timers.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 48f6c37ae5df..0332f7a60fd6 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -645,8 +645,6 @@ common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)
struct timespec64 ts64;
bool sig_none;
- memset(cur_setting, 0, sizeof(*cur_setting));
-
sig_none = (timr->it_sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE;
iv = timr->it_interval;
@@ -705,6 +703,7 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
if (!timr)
return -EINVAL;
+ memset(&cur_setting64, 0, sizeof(cur_setting64));
kc = timr->kclock;
if (WARN_ON_ONCE(!kc || !kc->timer_get))
ret = -EINVAL;