Commit 7939f8be authored Jan 16, 2019 by Linus Torvalds

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()

parents e8746440 8b05a3a7

kernel/trace/trace_kprobe.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -607,11 +607,17 @@ static int trace_kprobe_create(int argc, const char *argv[])
		char buf[MAX_EVENT_NAME_LEN];
		unsigned int flags = TPARG_FL_KERNEL;

		/* argc must be >= 1 */
		if (argv[0][0] == 'r') {
		switch (argv[0][0]) {
		case 'r':
		is_return = true;
		flags \|= TPARG_FL_RETURN;
		} else if (argv[0][0] != 'p' \|\| argc < 2)
		break;
		case 'p':
		break;
		default:
		return -ECANCELED;
		}
		if (argc < 2)
		return -ECANCELED;

		event = strchr(&argv[0][1], ':');