Skip to content
This repository has been archived by the owner on Dec 14, 2022. It is now read-only.

Commit

Permalink
tracing: Handle NULL formats in hold_module_trace_bprintk_format()
Browse files Browse the repository at this point in the history
If a task uses a non constant string for the format parameter in
trace_printk(), then the trace_printk_fmt variable is set to NULL. This
variable is then saved in the __trace_printk_fmt section.

The function hold_module_trace_bprintk_format() checks to see if duplicate
formats are used by modules, and reuses them if so (saves them to the list
if it is new). But this function calls lookup_format() that does a strcmp()
to the value (which is now NULL) and can cause a kernel oops.

This wasn't an issue till 3debb0a ("tracing: Fix trace_printk() to print
when not using bprintk()") which added "__used" to the trace_printk_fmt
variable, and before that, the kernel simply optimized it out (no NULL value
was saved).

The fix is simply to handle the NULL pointer in lookup_format() and have the
caller ignore the value if it was NULL.

Link: http://lkml.kernel.org/r/[email protected]

Reported-by: xingzhen <[email protected]>
Acked-by: Namhyung Kim <[email protected]>
Fixes: 3debb0a ("tracing: Fix trace_printk() to print when not using bprintk()")
Cc: [email protected] # v3.5+
Signed-off-by: Steven Rostedt <[email protected]>
  • Loading branch information
rostedt committed Jun 20, 2016
1 parent 5edb564 commit 70c8217
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion kernel/trace/trace_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ struct trace_bprintk_fmt {
static inline struct trace_bprintk_fmt *lookup_format(const char *fmt)
{
struct trace_bprintk_fmt *pos;

if (!fmt)
return ERR_PTR(-EINVAL);

list_for_each_entry(pos, &trace_bprintk_fmt_list, list) {
if (!strcmp(pos->fmt, fmt))
return pos;
Expand All @@ -57,7 +61,8 @@ void hold_module_trace_bprintk_format(const char **start, const char **end)
for (iter = start; iter < end; iter++) {
struct trace_bprintk_fmt *tb_fmt = lookup_format(*iter);
if (tb_fmt) {
*iter = tb_fmt->fmt;
if (!IS_ERR(tb_fmt))
*iter = tb_fmt->fmt;
continue;
}

Expand Down

0 comments on commit 70c8217

Please sign in to comment.