Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee500f27 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] fix 32bit overflow in timespec_to_sample() 



fix 32bit overflow in timespec_to_sample()

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 46596338

kernel/posix-cpu-timers.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ timespec_to_sample(clockid_t which_clock, const struct timespec *tp) 
	union cpu_time_count ret;

	ret.sched = 0;		/* high half always zero when .cpu used */

	if (CPUCLOCK_WHICH(which_clock) == CPUCLOCK_SCHED) {

		ret.sched = tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec;

		ret.sched = (unsigned long long)tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec;

	} else {

		ret.cpu = timespec_to_cputime(tp);

	}