Skip to content

Commit

Permalink
Merge tag 'trace-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Eiichi Tsukata found a small bug from the fixup of the stack code

  Removing ULONG_MAX as the marker for the user stack trace end, made
  the tracing code not know where the end is. The end is now marked with
  a zero (NULL) pointer. Eiichi fixed this in the tracing code"

* tag 'trace-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix user stack trace "??" output
  • Loading branch information
torvalds committed Jul 19, 2019
2 parents a84d2d2 + 6d54ceb commit 41ba485
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions kernel/trace/trace_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -1109,17 +1109,10 @@ static enum print_line_t trace_user_stack_print(struct trace_iterator *iter,
for (i = 0; i < FTRACE_STACK_ENTRIES; i++) {
unsigned long ip = field->caller[i];

if (ip == ULONG_MAX || trace_seq_has_overflowed(s))
if (!ip || trace_seq_has_overflowed(s))
break;

trace_seq_puts(s, " => ");

if (!ip) {
trace_seq_puts(s, "??");
trace_seq_putc(s, '\n');
continue;
}

seq_print_user_ip(s, mm, ip, flags);
trace_seq_putc(s, '\n');
}
Expand Down

0 comments on commit 41ba485

Please sign in to comment.