Linux / linux / 6a71398 / Merge tag 'trace-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Linux/linux 6a71398 — kernel/livepatch core.c, kernel/trace ftrace.c trace_uprobe.c

2019-06-15 17:24:11 UTC by Linus Torvalds on ⎇

master

Merge tag 'trace-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:

 - Out of range read of stack trace output

 - Fix for NULL pointer dereference in trace_uprobe_create()

 - Fix to a livepatching / ftrace permission race in the module code

 - Fix for NULL pointer dereference in free_ftrace_func_mapper()

 - A couple of build warning clean ups

* tag 'trace-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
  module: Fix livepatch/ftrace module text permissions race
  tracing/uprobe: Fix obsolete comment on trace_uprobe_create()
  tracing/uprobe: Fix NULL pointer dereference in trace_uprobe_create()
  tracing: Make two symbols static
  tracing: avoid build warning with HAVE_NOP_MCOUNT
  tracing: Fix out-of-range read in trace_stack_print()

Delta		File
+16	-6	kernel/trace/ftrace.c
+10	-5	kernel/trace/trace_uprobe.c
+6	-0	kernel/livepatch/core.c
+2	-2	kernel/trace/trace.c
+1	-1	kernel/trace/trace_output.c
+35	-14	5 files

Unified Split Raw