Wrong xx. sched: task_times() explosion avoidance for tasks with > 2^32 accrued ticks
If stime + utime > 2^32, and lower 32 are 0 when user calls getrusage(), you've got a dead box. Signed-off-by: Mike Galbraith <[email protected]> kernel/sched/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 82ad284..b0b0d29 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3155,7 +3155,7 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st) u64 temp = (__force u64) rtime; temp *= (__force u64) utime; - do_div(temp, (__force u32) total); + temp = div64_u64(temp, (__force u64) total); utime = (__force cputime_t) temp; } else utime = rtime; @@ -3188,7 +3188,7 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) u64 temp = (__force u64) rtime; temp *= (__force u64) cputime.utime; - do_div(temp, (__force u32) total); + temp = div64_u64(temp, (__force u64) total); utime = (__force cputime_t) temp; } else utime = rtime; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
