From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jan 2019 17:28:26 +0000 (+1200)
Subject: Merge tag 'trace-v5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7939f8beecf1cfb10d255be65bfbd3793fae82a1;p=android-x86%2Fkernel.git

Merge tag 'trace-v5.0-rc1' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Andrea Righi fixed a NULL pointer dereference in trace_kprobe_create()

  It is possible to trigger a NULL pointer dereference by writing an
  incorrectly formatted string to the krpobe_events file"

* tag 'trace-v5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobes: Fix NULL pointer dereference in trace_kprobe_create()
---

7939f8beecf1cfb10d255be65bfbd3793fae82a1