Revert "time: Handle negative seconds correctly in timespec64_to_ns()"

This reverts commit 7a25a0a94c8b49759582ac6141c06af4f3e8ae8f which is
commit 39ff83f2f6cc5cc1458dfcea9697f96338210beb upstream.

Arnd reports that this needs more review before being merged into all of
the trees.

Link: https://lore.kernel.org/r/CAK8P3a0z5jE=Z3Ps5bFTCFT7CHZR1JQ8VhdntDJAfsUxSPCcEw@mail.gmail.com
Reported-by: Arnd Bergmann <arnd@kernel.org>
Cc: Lukas Hannen <lukas.hannen@opensource.tttech-industrial.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/time64.h b/include/linux/time64.h
index f6059c505986b41e98307656968892167d542ef4..5eab3f2635186a777149d5ca21cb3ce5c4b7ae86 100644 (file)
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
@@ -33,9 +33,7 @@ struct itimerspec64 {
 #define TIME64_MIN                     (-TIME64_MAX - 1)
 
 #define KTIME_MAX                      ((s64)~((u64)1 << 63))
-#define KTIME_MIN                      (-KTIME_MAX - 1)
 #define KTIME_SEC_MAX                  (KTIME_MAX / NSEC_PER_SEC)
-#define KTIME_SEC_MIN                  (KTIME_MIN / NSEC_PER_SEC)
 
 /*
  * Limits for settimeofday():
@@ -134,13 +132,10 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts)
  */
 static inline s64 timespec64_to_ns(const struct timespec64 *ts)
 {
-       /* Prevent multiplication overflow / underflow */
-       if (ts->tv_sec >= KTIME_SEC_MAX)
+       /* Prevent multiplication overflow */
+       if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)
                return KTIME_MAX;
 
-       if (ts->tv_sec <= KTIME_SEC_MIN)
-               return KTIME_MIN;
-
        return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
 }