Commit 992d4e48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v6.17-rc6' of... 

Merge tag 'probes-fixes-v6.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull probe fix from Masami Hiramatsu:

 - kprobe-event: Fix null-ptr-deref in trace_kprobe_create_internal(),
   by handling NULL return of kmemdup() correctly

* tag 'probes-fixes-v6.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: kprobe-event: Fix null-ptr-deref in trace_kprobe_create_internal()
parents 37889cea dc3382ff

kernel/trace/trace_kprobe.c

+2 −0
Original line number Diff line number Diff line
@@ -908,6 +908,8 @@ static int trace_kprobe_create_internal(int argc, const char *argv[], 
			return -EINVAL;

		}

		buf = kmemdup(&argv[0][1], len + 1, GFP_KERNEL);

		if (!buf)

			return -ENOMEM;

		buf[len] = '\0';

		ret = kstrtouint(buf, 0, &maxactive);

		if (ret || !maxactive) {