Skip to content

Commit bea6832

Browse files
Stanislaw GruszkaKAGA-KOKO
Stanislaw Gruszka
authored andcommitted
sched: fix divide by zero at {thread_group,task}_times
On architectures where cputime_t is 64 bit type, is possible to trigger divide by zero on do_div(temp, (__force u32) total) line, if total is a non zero number but has lower 32 bit's zeroed. Removing casting is not a good solution since some do_div() implementations do cast to u32 internally. This problem can be triggered in practice on very long lived processes: PID: 2331 TASK: ffff880472814b00 CPU: 2 COMMAND: "oraagent.bin" #0 [ffff880472a51b70] machine_kexec at ffffffff8103214b #1 [ffff880472a51bd0] crash_kexec at ffffffff810b91c2 #2 [ffff880472a51ca0] oops_end at ffffffff814f0b00 #3 [ffff880472a51cd0] die at ffffffff8100f26b #4 [ffff880472a51d00] do_trap at ffffffff814f03f4 #5 [ffff880472a51d60] do_divide_error at ffffffff8100cfff torvalds#6 [ffff880472a51e00] divide_error at ffffffff8100be7b [exception RIP: thread_group_times+0x56] RIP: ffffffff81056a16 RSP: ffff880472a51eb8 RFLAGS: 00010046 RAX: bc3572c9fe12d194 RBX: ffff880874150800 RCX: 0000000110266fad RDX: 0000000000000000 RSI: ffff880472a51eb8 RDI: 001038ae7d9633dc RBP: ffff880472a51ef8 R8: 00000000b10a3a64 R9: ffff880874150800 R10: 00007fcba27ab680 R11: 0000000000000202 R12: ffff880472a51f08 R13: ffff880472a51f10 R14: 0000000000000000 R15: 0000000000000007 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 torvalds#7 [ffff880472a51f00] do_sys_times at ffffffff8108845d torvalds#8 [ffff880472a51f40] sys_times at ffffffff81088524 torvalds#9 [ffff880472a51f80] system_call_fastpath at ffffffff8100b0f2 RIP: 0000003808caac3a RSP: 00007fcba27ab6d8 RFLAGS: 00000202 RAX: 0000000000000064 RBX: ffffffff8100b0f2 RCX: 0000000000000000 RDX: 00007fcba27ab6e0 RSI: 000000000076d58e RDI: 00007fcba27ab6e0 RBP: 00007fcba27ab700 R8: 0000000000000020 R9: 000000000000091b R10: 00007fcba27ab680 R11: 0000000000000202 R12: 00007fff9ca41940 R13: 0000000000000000 R14: 00007fcba27ac9c0 R15: 00007fff9ca41940 ORIG_RAX: 0000000000000064 CS: 0033 SS: 002b Cc: [email protected] Signed-off-by: Stanislaw Gruszka <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent a35b646 commit bea6832

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

kernel/sched/core.c

+20-14
Original file line numberDiff line numberDiff line change
@@ -3142,6 +3142,20 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
31423142
# define nsecs_to_cputime(__nsecs) nsecs_to_jiffies(__nsecs)
31433143
#endif
31443144

3145+
static cputime_t scale_utime(cputime_t utime, cputime_t rtime, cputime_t total)
3146+
{
3147+
u64 temp = (__force u64) rtime;
3148+
3149+
temp *= (__force u64) utime;
3150+
3151+
if (sizeof(cputime_t) == 4)
3152+
temp = div_u64(temp, (__force u32) total);
3153+
else
3154+
temp = div64_u64(temp, (__force u64) total);
3155+
3156+
return (__force cputime_t) temp;
3157+
}
3158+
31453159
void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
31463160
{
31473161
cputime_t rtime, utime = p->utime, total = utime + p->stime;
@@ -3151,13 +3165,9 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
31513165
*/
31523166
rtime = nsecs_to_cputime(p->se.sum_exec_runtime);
31533167

3154-
if (total) {
3155-
u64 temp = (__force u64) rtime;
3156-
3157-
temp *= (__force u64) utime;
3158-
do_div(temp, (__force u32) total);
3159-
utime = (__force cputime_t) temp;
3160-
} else
3168+
if (total)
3169+
utime = scale_utime(utime, rtime, total);
3170+
else
31613171
utime = rtime;
31623172

31633173
/*
@@ -3184,13 +3194,9 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
31843194
total = cputime.utime + cputime.stime;
31853195
rtime = nsecs_to_cputime(cputime.sum_exec_runtime);
31863196

3187-
if (total) {
3188-
u64 temp = (__force u64) rtime;
3189-
3190-
temp *= (__force u64) cputime.utime;
3191-
do_div(temp, (__force u32) total);
3192-
utime = (__force cputime_t) temp;
3193-
} else
3197+
if (total)
3198+
utime = scale_utime(cputime.utime, rtime, total);
3199+
else
31943200
utime = rtime;
31953201

31963202
sig->prev_utime = max(sig->prev_utime, utime);

0 commit comments

Comments
 (0)