path: root/include/linux/time.h
diff options
authorJohn Stultz <>2012-08-31 13:30:06 -0400
committerLinus Torvalds <>2012-09-01 10:24:48 -0700
commitcee58483cf56e0ba355fdd97ff5e8925329aa936 (patch)
tree8cc2dc979a93a48a07c25d309250a2271e508e21 /include/linux/time.h
parent7a611e69b26069a511d9d5251c6a28af6c521121 (diff)
time: Move ktime_t overflow checking into timespec_valid_strict
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 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 <> Cc: Zhouping Liu <> Cc: Ingo Molnar <> Cc: Prarit Bhargava <> Cc: Thomas Gleixner <> Cc: Signed-off-by: John Stultz <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'include/linux/time.h')
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index b0bbd8f0130d..b51e664c83e7 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -125,6 +125,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;