Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1411491

[tip:timers/urgent] time: Make settimeofday error checking work again

Show all headers | View raw

Commit-ID:  dfc2507b26af22b0bbc85251b8545b36d8bc5d72
Gitweb:     http://git.kernel.org/tip/dfc2507b26af22b0bbc85251b8545b36d8bc5d72
Author:     John Stultz <john.stultz@linaro.org>
AuthorDate: Wed, 1 Jun 2016 11:53:26 -0700
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 1 Jun 2016 21:13:43 +0200

time: Make settimeofday error checking work again

In commit 86d3473224b0 some of the checking for a valid timeval
was subtley changed which caused -EINVAL to be returned whenever
the timeval was null.

However, it is possible to set the timezone data while specifying
a NULL timeval, which is usually done to handle systems where the
RTC keeps local time instead of UTC. Thus the patch causes such
systems to have the time incorrectly set.

This patch addresses the issue by handling the error conditionals
in the same way as was done previously.

Fixes: 86d3473224b0 "time: Introduce do_sys_settimeofday64()"
Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Baolin Wang <baolin.wang@linaro.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Link: http://lkml.kernel.org/r/1464807207-16530-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 include/linux/timekeeping.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 37dbacf..816b754 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -21,6 +21,9 @@ static inline int do_sys_settimeofday(const struct timespec *tv,
 	struct timespec64 ts64;
 
 	if (!tv)
+		return do_sys_settimeofday64(NULL, tz);
+
+	if (!timespec_valid(tv))
 		return -EINVAL;
 
 	ts64 = timespec_to_timespec64(*tv);

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/2 v2] Fix for settimeofday() error checking regression John Stultz <john.stultz@linaro.org> - 2016-06-01 21:00 +0200
  [PATCH 2/2] kselftests: timers: Add set-tz test case John Stultz <john.stultz@linaro.org> - 2016-06-01 21:00 +0200
    Re: [PATCH 2/2] kselftests: timers: Add set-tz test case Shuah Khan <shuahkh@osg.samsung.com> - 2016-06-03 00:50 +0200
  [PATCH 1/2 v2] time: Fix problematic change in settimeofday error checking John Stultz <john.stultz@linaro.org> - 2016-06-01 21:00 +0200
    [tip:timers/urgent] time: Make settimeofday error checking work  again tip-bot for John Stultz <tipbot@zytor.com> - 2016-06-01 21:30 +0200

csiph-web