ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO
authorJohn Stultz <john.stultz@linaro.org>
Thu, 21 Jan 2016 23:03:34 +0000 (15:03 -0800)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 22 Jan 2016 11:01:42 +0000 (12:01 +0100)
commitdd4e17ab704269bce71402285f5e8b9ac24b1eff
treef2db2bd33dd1c38ddab21d029c216466ae54d4be
parent51cbb5242a41700a3f250ecfb48dcfb7e4375ea4
ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO

Recently, in commit 37cf4dc3370f I forgot to check if the timeval being passed
was actually a timespec (as is signaled with ADJ_NANO).

This resulted in that patch breaking ADJ_SETOFFSET users who set
ADJ_NANO, by rejecting valid timespecs that were compared with
valid timeval ranges.

This patch addresses this by checking for the ADJ_NANO flag and
using the timepsec check instead in that case.

Reported-by: Harald Hoyer <harald@redhat.com>
Reported-by: Kay Sievers <kay@vrfy.org>
Fixes: 37cf4dc3370f "time: Verify time values in adjtimex ADJ_SETOFFSET to avoid overflow"
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Link: http://lkml.kernel.org/r/1453417415-19110-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/ntp.c