[PATCH] cputime: Fix timeval/timespec-->cputime conversion

[PATCH] cputime: Fix timeval/timespec-->cputime conversion

[zengtao]

The datatype __kernel_time_t is u32 on 32bit platform,
it will easily get overflow, so force u64 conversion.

Currently the following function will be affected:
1. setitimer()
2. timer_create/timer_settime()
3. sys_clock_nanosleep
And this will occur on MIPS32 and ARM32 with "Full dynticks CPU
time accounting" enabled, which is required for CONFIG_NO_HZ_FULL.

Signed-off-by: zengtao <prime.zeng@huawei.com>
---
 include/asm-generic/cputime_nsecs.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/cputime_nsecs.h b/include/asm-generic/cputime_nsecs.h
index 0419485..0f1c6f3 100644
--- a/include/asm-generic/cputime_nsecs.h
+++ b/include/asm-generic/cputime_nsecs.h
@@ -75,7 +75,7 @@ typedef u64 __nocast cputime64_t;
  */
 static inline cputime_t timespec_to_cputime(const struct timespec *val)
 {
-	u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
+	u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
 	return (__force cputime_t) ret;
 }
 static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
@@ -91,7 +91,8 @@ static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
  */
 static inline cputime_t timeval_to_cputime(const struct timeval *val)
 {
-	u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_usec * NSEC_PER_USEC;
+	u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
+			val->tv_usec * NSEC_PER_USEC;
 	return (__force cputime_t) ret;
 }
 static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)
-- 
1.9.1

Re: [PATCH] cputime: Fix timeval/timespec-->cputime conversion

[Arnd Bergmann]

On Tuesday 02 February 2016 11:38:34 zengtao wrote:
> The datatype __kernel_time_t is u32 on 32bit platform,
> it will easily get overflow, so force u64 conversion.
> 
> Currently the following function will be affected:
> 1. setitimer()
> 2. timer_create/timer_settime()
> 3. sys_clock_nanosleep
> And this will occur on MIPS32 and ARM32 with "Full dynticks CPU
> time accounting" enabled, which is required for CONFIG_NO_HZ_FULL.
> 
> Signed-off-by: zengtao <prime.zeng@huawei.com>
> 

The patch looks good now, but please add a line saying

Fixes: 31c1fc818715 ("ARM: Kconfig: allow full nohz CPU accounting")

below your Signed-off-by, so everyone can figure out whether they
need this backported or not.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>

Thomas, do you want to take this through the tip tree?

[tip:timers/urgent] cputime: Prevent 32bit overflow in time[ val|spec]_to_cputime()

[tip-bot for zengtao]

Commit-ID:  0f26922fe5dc5724b1adbbd54b21bad03590b4f3
Gitweb:     http://git.kernel.org/tip/0f26922fe5dc5724b1adbbd54b21bad03590b4f3
Author:     zengtao <prime.zeng@huawei.com>
AuthorDate: Tue, 2 Feb 2016 11:38:34 +0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 2 Feb 2016 15:24:38 +0100

cputime: Prevent 32bit overflow in time[val|spec]_to_cputime()

The datatype __kernel_time_t is u32 on 32bit platform, so its subject to
overflows in the timeval/timespec to cputime conversion.

Currently the following functions are affected:
1. setitimer()
2. timer_create/timer_settime()
3. sys_clock_nanosleep

This can happen on MIPS32 and ARM32 with "Full dynticks CPU time accounting"
enabled, which is required for CONFIG_NO_HZ_FULL.

Enforce u64 conversion to prevent the overflow.

Fixes: 31c1fc818715 ("ARM: Kconfig: allow full nohz CPU accounting")
Signed-off-by: zengtao <prime.zeng@huawei.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: <fweisbec@gmail.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1454384314-154784-1-git-send-email-prime.zeng@huawei.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 include/asm-generic/cputime_nsecs.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/cputime_nsecs.h b/include/asm-generic/cputime_nsecs.h
index 0419485..0f1c6f3 100644
--- a/include/asm-generic/cputime_nsecs.h
+++ b/include/asm-generic/cputime_nsecs.h
@@ -75,7 +75,7 @@ typedef u64 __nocast cputime64_t;
  */
 static inline cputime_t timespec_to_cputime(const struct timespec *val)
 {
-	u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
+	u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
 	return (__force cputime_t) ret;
 }
 static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
@@ -91,7 +91,8 @@ static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
  */
 static inline cputime_t timeval_to_cputime(const struct timeval *val)
 {
-	u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_usec * NSEC_PER_USEC;
+	u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
+			val->tv_usec * NSEC_PER_USEC;
 	return (__force cputime_t) ret;
 }
 static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)