Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c7a3a3d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Zero out oldval itimerspec 



The recent posix timer rework moved the clearing of the itimerspec to the
real syscall implementation, but forgot that the kclock->timer_get() is
used by timer_settime() as well. That results in an uninitialized variable
and bogus values returned to user space.

Add the missing memset to timer_settime().

Fixes: eabdec04 ("posix-timers: Zero settings value in common code")
Reported-by: default avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Link: http://lkml.kernel.org/r/20170609201156.GB21491@outlook.office365.com
parent c6503be5

kernel/time/posix-timers.c

+2 −0
Original line number Diff line number Diff line
@@ -828,6 +828,8 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags, 
	if (!timespec64_valid(&new_spec64.it_interval) ||

	    !timespec64_valid(&new_spec64.it_value))

		return -EINVAL;

	if (rtn)

		memset(rtn, 0, sizeof(*rtn));

retry:

	timr = lock_timer(timer_id, &flag);

	if (!timr)