Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"A single fix preventing a 32bit overflow in timespec/val to cputime
conversions on 32bit machines"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cputime: Prevent 32bit overflow in time[val|spec]_to_cputime()
+3
-2
+3
-2
include/asm-generic/cputime_nsecs.h
+3
-2
include/asm-generic/cputime_nsecs.h
···
75
75
*/
76
76
static inline cputime_t timespec_to_cputime(const struct timespec *val)
77
77
{
78
-
u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
78
+
u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
79
79
return (__force cputime_t) ret;
80
80
}
81
81
static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
···
91
91
*/
92
92
static inline cputime_t timeval_to_cputime(const struct timeval *val)
93
93
{
94
-
u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_usec * NSEC_PER_USEC;
94
+
u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
95
+
val->tv_usec * NSEC_PER_USEC;
95
96
return (__force cputime_t) ret;
96
97
}
97
98
static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)