[PATCH] prevent timespec/timeval to ktime_t overflow

Frank v. Waveren pointed out that on 64bit machines the timespec to
ktime_t conversion might overflow. This is also true for timeval to
ktime_t conversions. This breaks a "sleep inf" on 64bit machines.

While a timespec/timeval with tx.sec = MAX_LONG is valid by specification
the internal representation of ktime_t is based on nanoseconds. The
conversion of seconds to nanoseconds overflows for seconds values >=
(MAX_LONG / NSEC_PER_SEC).

Check the seconds argument to the conversion and limit it to the maximum
time which can be represented by ktime_t.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Frank v Waveren <fvw@var.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Thomas Gleixner and committed by Linus Torvalds 96dd7421 fe2bbc48

+6 -1
+6 -1
include/linux/ktime.h
··· 56 56 #endif 57 57 } ktime_t; 58 58 59 - #define KTIME_MAX (~((u64)1 << 63)) 59 + #define KTIME_MAX ((s64)~((u64)1 << 63)) 60 + #define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) 60 61 61 62 /* 62 63 * ktime_t definitions when using the 64-bit scalar representation: ··· 74 73 */ 75 74 static inline ktime_t ktime_set(const long secs, const unsigned long nsecs) 76 75 { 76 + #if (BITS_PER_LONG == 64) 77 + if (unlikely(secs >= KTIME_SEC_MAX)) 78 + return (ktime_t){ .tv64 = KTIME_MAX }; 79 + #endif 77 80 return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs }; 78 81 } 79 82