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

torvalds · torvalds · commit 992d4e481e95 · 2025-09-17T16:52:26.000-07:00
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()
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -908,6 +908,8 @@ static int trace_kprobe_create_internal(int argc, const char *argv[],`
`908`	`908`	`return -EINVAL;`
`909`	`909`	`}`
`910`	`910`	`buf = kmemdup(&argv[0][1], len + 1, GFP_KERNEL);`
	`911`	`+ if (!buf)`
	`912`	`+ return -ENOMEM;`
`911`	`913`	`buf[len] = '\0';`
`912`	`914`	`ret = kstrtouint(buf, 0, &maxactive);`
`913`	`915`	`if (ret \|\| !maxactive) {`