diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-17 16:52:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-17 16:52:26 -0700 |
| commit | 992d4e481e958c6898fe750afd429d1b585fff93 (patch) | |
| tree | d5f6e33c7a4fda970488e51a70cf519a5830a98f | |
| parent | 37889ceadde0329621a1a1f253febb2019dfdec2 (diff) | |
| parent | dc3382fffdec2c1d6df5836c88fa37b39cd8651e (diff) | |
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()
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index ccae62d4fb91..fa60362a3f31 100644 --- 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) { |