| From 1687e2b1a6aa0c2f1a3533a5574056747f3080a1 Mon Sep 17 00:00:00 2001 |
| From: Wen Yang <wenyang@linux.alibaba.com> |
| Date: Fri, 3 Jan 2020 11:02:48 +0800 |
| Subject: [PATCH] ftrace: Avoid potential division by zero in function profiler |
| |
| commit e31f7939c1c27faa5d0e3f14519eaf7c89e8a69d upstream. |
| |
| The ftrace_profile->counter is unsigned long and |
| do_div truncates it to 32 bits, which means it can test |
| non-zero and be truncated to zero for division. |
| Fix this issue by using div64_ul() instead. |
| |
| Link: http://lkml.kernel.org/r/20200103030248.14516-1-wenyang@linux.alibaba.com |
| |
| Cc: stable@vger.kernel.org |
| Fixes: e330b3bcd8319 ("tracing: Show sample std dev in function profiling") |
| Fixes: 34886c8bc590f ("tracing: add average time in function to function profiler") |
| Signed-off-by: Wen Yang <wenyang@linux.alibaba.com> |
| Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c |
| index baa54a76c6aa..018aa2211c2d 100644 |
| --- a/kernel/trace/ftrace.c |
| +++ b/kernel/trace/ftrace.c |
| @@ -523,8 +523,7 @@ static int function_stat_show(struct seq_file *m, void *v) |
| } |
| |
| #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
| - avg = rec->time; |
| - do_div(avg, rec->counter); |
| + avg = div64_ul(rec->time, rec->counter); |
| if (tracing_thresh && (avg < tracing_thresh)) |
| goto out; |
| #endif |
| @@ -550,7 +549,8 @@ static int function_stat_show(struct seq_file *m, void *v) |
| * Divide only 1000 for ns^2 -> us^2 conversion. |
| * trace_print_graph_duration will divide 1000 again. |
| */ |
| - do_div(stddev, rec->counter * (rec->counter - 1) * 1000); |
| + stddev = div64_ul(stddev, |
| + rec->counter * (rec->counter - 1) * 1000); |
| } |
| |
| trace_seq_init(&s); |
| -- |
| 2.7.4 |
| |
