Commit e31f7939 authored by Wen Yang's avatar Wen Yang Committed by Steven Rostedt (VMware)

ftrace: Avoid potential division by zero in function profiler

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: e330b3bc ("tracing: Show sample std dev in function profiling")
Fixes: 34886c8b ("tracing: add average time in function to function profiler")
Signed-off-by: default avatarWen Yang <wenyang@linux.alibaba.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent b8299d36
...@@ -526,8 +526,7 @@ static int function_stat_show(struct seq_file *m, void *v) ...@@ -526,8 +526,7 @@ static int function_stat_show(struct seq_file *m, void *v)
} }
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
avg = rec->time; avg = div64_ul(rec->time, rec->counter);
do_div(avg, rec->counter);
if (tracing_thresh && (avg < tracing_thresh)) if (tracing_thresh && (avg < tracing_thresh))
goto out; goto out;
#endif #endif
...@@ -553,7 +552,8 @@ static int function_stat_show(struct seq_file *m, void *v) ...@@ -553,7 +552,8 @@ static int function_stat_show(struct seq_file *m, void *v)
* Divide only 1000 for ns^2 -> us^2 conversion. * Divide only 1000 for ns^2 -> us^2 conversion.
* trace_print_graph_duration will divide 1000 again. * 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); trace_seq_init(&s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment