diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-09-17 22:32:10 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:37:11 +0200 |
| commit | 0f467fcfbdfbad2a9b1f06dd15729fd22b461bf0 (patch) | |
| tree | 9549120d31db5e320ae4abb88e222443dc8066e4 /include | |
| parent | 61b76840ddee647c0c223365378c3f394355b7d7 (diff) | |
time: Move ktime_t overflow checking into timespec_valid_strict
This is a -stable backport of cee58483cf56e0ba355fdd97ff5e8925329aa936
Andreas Bombe reported that the added ktime_t overflow checking added to
timespec_valid in commit 4e8b14526ca7 ("time: Improve sanity checking of
timekeeping inputs") was causing problems with X.org because it caused
timeouts larger then KTIME_T to be invalid.
Previously, these large timeouts would be clamped to KTIME_MAX and would
never expire, which is valid.
This patch splits the ktime_t overflow checking into a new
timespec_valid_strict function, and converts the timekeeping codes
internal checking to use this more strict function.
Reported-and-tested-by: Andreas Bombe <aeb@debian.org>
Cc: Zhouping Liu <zliu@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/time.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 146b6f3c23b9..bc93987d05a0 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -109,6 +109,13 @@ static inline bool timespec_valid(const struct timespec *ts) /* Can't have more nanoseconds then a second */ if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC) return false; + return true; +} + +static inline bool timespec_valid_strict(const struct timespec *ts) +{ + if (!timespec_valid(ts)) + return false; /* Disallow values that could overflow ktime_t */ if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX) return false; |