perf tools: Fix OOB reads, NULL deref, and resource leaks
Arnaldo Carvalho de Melo
maintainerv2 cover perf tools: Fix OOB reads, NULL deref, and resource leaks
Hi,
Four pre-existing bugs found by sashiko-bot during AI-assisted review of the perf-data-validation hardening series. All are independent of that series -- they are latent bugs in surrounding code exposed during review.
1. test_bit(sample->cpu, cpu_bitmap) reads out of bounds when PERF_SAMPLE_CPU is absent (sample->cpu == (u32)-1) in annotate, diff, report, and sched timehist.
2. Thread reference leak in perf sched latency_switch_event() -- one error path does 'return -1' instead of 'goto out_put'.
3. NULL pointer dereference in perf sched latency_runtime_event() -- thread_atoms_search() called before the NULL check on the thread returned by machine__findnew_thread().
4. Heap buffer overflow in perf sched map --compact mode -- comp_cpus allocated based on host CPU count but indexed using a MAX_CPUS-sized bitmap, overflowing when analyzing recordings from machines with more CPUs than the host. Also fixes the sizeof mismatch from the int-to-struct perf_cpu type change, removes the now-dead sysconf(_SC_NPROCESSORS_CONF) initialization, and fixes an off-by-one in the non-compact path where max_cpu (0-based index) was used as cpus_nr (count) without adding 1.
All four require crafted or unusual perf.data inputs to trigger. Verified with gcc and clang builds, checkpatch, and perf test.
Changes in v2:
- Patch 4: fix off-by-one in non-compact path — max_cpu.cpu is a 0-based index, needs + 1 when used as cpus_nr (count). Reported by sashiko-bot.
Arnaldo Carvalho de Melo (4):
perf tools: Guard test_bit from out-of-bounds sample CPU perf sched: Fix thread reference leak in latency_switch_event perf sched: Fix NULL dereference in latency_runtime_event perf sched: Fix comp_cpus heap overflow with cross-machine recordings
tools/perf/builtin-annotate.c | 3 ++- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-report.c | 3 ++- tools/perf/builtin-sched.c | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-)
Developed with AI assistance (Claude/sashiko), tagged in commits.
Thanks a lot,
- Arnaldo
Arnaldo Carvalho de Melo
maintainerPATCH v2 1/4 perf tools: Guard test_bit from out-of-bounds sample CPU
From: Arnaldo Carvalho de Melo <[email protected]>
When PERF_SAMPLE_CPU is absent from a perf.data file, sample->cpu is initialized to (u32)-1 by evsel__parse_sample(). Five call sites pass this value directly to test_bit(sample->cpu, cpu_bitmap), reading massively out of bounds past the DECLARE_BITMAP(..., MAX_NR_CPUS) allocation of 4096 bits.
Add a sample->cpu >= MAX_NR_CPUS guard before each test_bit() call, matching the existing safe pattern in builtin-kwork.c. This catches both the (u32)-1 sentinel and any corrupted CPU value exceeding the bitmap size.
--- tools/perf/builtin-annotate.c | 3 ++- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-report.c | 3 ++- tools/perf/builtin-sched.c | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-)
tools/perf/builtin-annotate.c +2 -1
@@ -295,7 +295,8 @@ static int process_sample_event(const struct perf_tool *tool, goto out_put; } -if (ann->cpu_list && !test_bit (sample->cpu, ann->cpu_bitmap)) +if (ann->cpu_list && (sample->cpu >=MAX_NR_CPUS || + !test_bit (sample->cpu, ann->cpu_bitmap))) goto out_put; if (!al.filtered &&
tools/perf/builtin-diff.c +2 -1
@@ -416,7 +416,8 @@ static int diff__process_sample_event(const struct perf_tool *tool, goto out; } -if (cpu_list && !test_bit (sample->cpu, cpu_bitmap)) { +if (cpu_list && (sample->cpu >=MAX_NR_CPUS || + !test_bit (sample->cpu, cpu_bitmap))) { ret =0 ; goto out; }
tools/perf/builtin-report.c +2 -1
@@ -298,7 +298,8 @@ static int process_sample_event(const struct perf_tool *tool,if (symbol_conf.hide_unresolved && al.sym ==NULL ) goto out_put; -if (rep->cpu_list && !test_bit (sample->cpu, rep->cpu_bitmap)) +if (rep->cpu_list && (sample->cpu >=MAX_NR_CPUS || + !test_bit (sample->cpu, rep->cpu_bitmap))) goto out_put;if (sort__mode ==SORT_MODE__BRANCH ) {
tools/perf/builtin-sched.c +4 -2
@@ -2192,7 +2192,8 @@ static void timehist_print_sample(struct perf_sched *sched,char nstr[30 ];u64 wait_time; -if (cpu_list && !test_bit (sample->cpu, cpu_bitmap)) +if (cpu_list && (sample->cpu >=MAX_NR_CPUS || + !test_bit (sample->cpu, cpu_bitmap)))return ;timestamp__scnprintf_usec (t, tstr,sizeof (tstr));
@@ -2871,7 +2872,8 @@ static int timehist_sched_change_event(const struct perf_tool *tool, }if (!sched->idle_hist ||thread__tid (thread) ==0 ) { -if (!cpu_list ||test_bit (sample->cpu, cpu_bitmap)) +if (!cpu_list || (sample->cpu <MAX_NR_CPUS && +test_bit (sample->cpu, cpu_bitmap)))timehist_update_runtime_stats (tr, t, tprev);if (sched->idle_hist) {
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH 1/4] perf tools: Guard test_bit from out-of-bounds sample CPU
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] The patch adds MAX_NR_CPUS bounds checks to several call sites of test_bit() to prevent out-of-bounds reads from corrupted sample->cpu values, but misses an identical vulnerability in tools/perf/util/auxtrace.c. --
commit 086b55e55838d35a34eaf71d763ccfabb74ba9a3
Author: Arnaldo Carvalho de Melo <[email protected]>
perf tools: Guard test_bit from out-of-bounds sample CPU
This commit adds guards against MAX_NR_CPUS before test_bit() calls across several built-in tools to prevent out-of-bounds reads on corrupted sample->cpu values.
tools/perf/builtin-annotate.c static int process_sample_event(const struct perf_tool *tool, · line 300
Quoted 12 lines
tools/perf/builtin-annotate.c +2
-1@@ -295,7 +295,8 @@ static int process_sample_event(const struct perf_tool *tool, goto out_put; } -if (ann->cpu_list && !test_bit (sample->cpu, ann->cpu_bitmap)) +if (ann->cpu_list && (sample->cpu >=MAX_NR_CPUS || + !test_bit (sample->cpu, ann->cpu_bitmap))) goto out_put;
[Severity: High]
This isn't a bug introduced by this patch, but does a similar out-of-bounds read of cpu_bitmap exist in tools/perf/util/auxtrace.c?
Looking at filter_cpu() in tools/perf/util/auxtrace.c:
return cpu_bitmap && cpu.cpu != -1 && !test_bit(cpu.cpu, cpu_bitmap);
Since auxtrace events can bypass the upstream clamping logic in perf_session__deliver_event(), could a corrupted cpu value from a perf.data file exceed the bitmap size?
Should filter_cpu() also verify cpu.cpu < MAX_NR_CPUS before calling test_bit() to prevent reading past the allocation?
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/4] perf tools: Guard test_bit from out-of-bounds sample CPU
Quoted 34 lines · On Thu, Jun 04, 2026 at 09:09:03PM +0000, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] The patch addsMAX_NR_CPUSbounds checks to several call sites oftest_bit()to prevent out-of-bounds reads from corruptedsample->cpuvalues, but misses an identical vulnerability intools/perf/util/auxtrace.c. --commit
086b55e55838d35a34eaf71d763ccfabb74ba9a3
Author: Arnaldo Carvalho de Melo <[email protected]>perf tools: Guard
test_bitfrom out-of-bounds sample CPUThis commit adds guards against
MAX_NR_CPUSbeforetest_bit()calls across several built-in tools to prevent out-of-bounds reads on corruptedsample->cpuvalues.tools/perf/builtin-annotate.c static int process_sample_event(const struct perf_tool *tool, · line 300
Quoted 12 lines
tools/perf/builtin-annotate.c +2
-1@@ -295,7 +295,8 @@ static int process_sample_event(const struct perf_tool *tool, goto out_put; } -if (ann->cpu_list && !test_bit (sample->cpu, ann->cpu_bitmap)) +if (ann->cpu_list && (sample->cpu >=MAX_NR_CPUS || + !test_bit (sample->cpu, ann->cpu_bitmap))) goto out_put;[Severity: High]
This isn't a bug introduced by this patch, but does a similar out-of-bounds read ofcpu_bitmapexist intools/perf/util/auxtrace.c?Looking at
filter_cpu()intools/perf/util/auxtrace.c:
Quoted 8 lines
return cpu_bitmap && cpu.cpu != -1 && !test_bit(cpu.cpu, cpu_bitmap);Since auxtrace events can bypass the upstream clamping logic in
perf_session__deliver_event(), could a corrupted cpu value from a perf.data file exceed the bitmap size?Should
filter_cpu()also verify cpu.cpu <MAX_NR_CPUSbefore callingtest_bit()to prevent reading past the allocation?
We're addressing this in a followup series,
- Arnaldo
Arnaldo Carvalho de Melo
maintainerPATCH v2 2/4 perf sched: Fix thread reference leak in latency_switch_event
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
In latency_switch_event(), after acquiring thread references for sched_out and sched_in via machine__findnew_thread(), the first add_sched_out_event() failure path does 'return -1', bypassing the out_put label that calls thread__put() on both references.
The second and third add_sched_out_event() failures correctly use 'goto out_put'. Fix the first one to match.
--- tools/perf/builtin-sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-sched.c +1 -1
@@ -1180,7 +1180,7 @@ static int latency_switch_event(struct perf_sched *sched, } }if (add_sched_out_event (out_events, prev_state, timestamp)) -return -1 ; + goto out_put; in_events =thread_atoms_search (&sched->atom_root, sched_in, &sched->cmp_pid);if (!in_events) {
Signature · 1 line
2.54.0
Arnaldo Carvalho de Melo
maintainerPATCH v2 3/4 perf sched: Fix NULL dereference in latency_runtime_event
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
latency_runtime_event() passes the return value of machine__findnew_thread() directly to thread_atoms_search() at line 1216, before checking for NULL at line 1220. thread_atoms_search() calls pid_cmp() which dereferences the thread pointer via thread__tid(), causing a NULL pointer dereference if the allocation fails.
All other callers of thread_atoms_search() in this file (latency_switch_event, latency_wakeup_event, latency_migrate_task_event) correctly check for NULL first.
Move the atoms assignment after the NULL check to match the pattern used by the other callers.
--- tools/perf/builtin-sched.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-sched.c +3 -1
@@ -1213,13 +1213,15 @@ static int latency_runtime_event(struct perf_sched *sched,const u32 pid =perf_sample__intval (sample,"pid" );const u64 runtime =perf_sample__intval (sample,"runtime" );struct thread *thread =machine__findnew_thread (machine,-1 , pid); -struct work_atoms *atoms =thread_atoms_search (&sched->atom_root, thread, &sched->cmp_pid); +struct work_atoms *atoms;u64 timestamp = sample->time;int cpu = sample->cpu, err =-1 ;if (thread ==NULL )return -1 ; + atoms =thread_atoms_search (&sched->atom_root, thread, &sched->cmp_pid); +/* perf.data is untrusted input — CPU may be absent or corrupted */ if (cpu >=MAX_CPUS || cpu <0 ) { pr_warning("WARNING: at offset %#" PRIx64 ": out-of-bound sample CPU %d, skipping sample\n",
Signature · 1 line
2.54.0
Arnaldo Carvalho de Melo
maintainerPATCH v2 4/4 perf sched: Fix comp_cpus heap overflow with cross-machine recordings
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
setup_map_cpus() allocates comp_cpus based on sysconf(_SC_NPROCESSORS_CONF), the host machine's CPU count. But map_switch_event() indexes comp_cpus using cpus_nr derived from bitmap_weight(comp_cpus_mask, MAX_CPUS), where comp_cpus_mask is declared as DECLARE_BITMAP(..., MAX_CPUS) with MAX_CPUS=4096.
When analyzing a perf.data recording from a machine with more CPUs than the analysis host (e.g. 128-CPU server recording analyzed on an 8-CPU laptop), cpus_nr exceeds the allocation size, causing a heap buffer overflow.
Also fix a type mismatch: comp_cpus is 'struct perf_cpu *' (2 bytes per element) but was allocated with sizeof(int) (4 bytes per element).
Allocate comp_cpus with MAX_CPUS entries using the correct element size, matching the comp_cpus_mask bitmap bounds. Remove the sysconf(_SC_NPROCESSORS_CONF) initialization of max_cpu — its only consumer was the comp_cpus allocation, and max_cpu is dynamically updated from the recording's events during processing. Fix the non-compact path to use max_cpu.cpu + 1 as cpus_nr, converting from 0-based index to count — sysconf() returned a count which masked this off-by-one.
--- tools/perf/builtin-sched.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
tools/perf/builtin-sched.c +2 -4
@@ -1670,7 +1670,7 @@ static int map_switch_event(struct perf_sched *sched, struct perf_sample *sampl new_cpu = true; } }else - cpus_nr = sched->max_cpu.cpu; + cpus_nr = sched->max_cpu.cpu +1 ; timestamp0 = sched->cpu_last_switched[this_cpu.cpu]; sched->cpu_last_switched[this_cpu.cpu] = timestamp;
@@ -3573,10 +3573,8 @@ static int perf_sched__lat(struct perf_sched *sched)static int setup_map_cpus (struct perf_sched *sched) { - sched->max_cpu.cpu =sysconf (_SC_NPROCESSORS_CONF); -if (sched->map.comp) { - sched->map.comp_cpus =calloc (sched->max_cpu.cpu,sizeof (int )); + sched->map.comp_cpus =calloc (MAX_CPUS ,sizeof (*sched->map.comp_cpus));if (!sched->map.comp_cpus)return -1 ; }
Signature · 1 line
2.54.0
Quoted 35 lines · Arnaldo Carvalho de Melo
Hi,
Four pre-existing bugs found by sashiko-bot during AI-assisted review of the perf-data-validation hardening series. All are independent of that series -- they are latent bugs in surrounding code exposed during review.
1.
test_bit(sample->cpu, cpu_bitmap)reads out of bounds whenPERF_SAMPLE_CPUis absent (sample->cpu== (u32)-1) in annotate, diff, report, and sched timehist.2. Thread reference leak in perf sched
latency_switch_event()-- one error path does 'return -1' instead of 'gotoout_put'.3. NULL pointer dereference in perf sched
latency_runtime_event()--thread_atoms_search()called before the NULL check on the thread returned bymachine__findnew_thread().4. Heap buffer overflow in perf sched map --compact mode --
comp_cpusallocated based on host CPU count but indexed using a MAX_CPUS-sized bitmap, overflowing when analyzing recordings from machines with more CPUs than the host. Also fixes the sizeof mismatch from the int-to-structperf_cputype change, removes the now-deadsysconf(_SC_NPROCESSORS_CONF)initialization, and fixes an off-by-one in the non-compact path wheremax_cpu(0-based index) was used ascpus_nr(count) without adding 1.All four require crafted or unusual perf.data inputs to trigger. Verified with gcc and clang builds, checkpatch, and perf test.
Changes in v2:
- Patch 4: fix off-by-one in non-compact path — max_cpu.cpu is a 0-based index, needs + 1 when used ascpus_nr(count). Reported by sashiko-bot.
Quoted 5 lines
Arnaldo Carvalho de Melo (4):
perf tools: Guardtest_bitfrom out-of-bounds sample CPU perf sched: Fix thread reference leak inlatency_switch_eventperf sched: Fix NULL dereference inlatency_runtime_eventperf sched: Fixcomp_cpusheap overflow with cross-machine recordings
Thanks,
Namhyung
Quoted 12 lines
tools/perf/builtin-annotate.c | 3 ++- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-report.c | 3 ++- tools/perf/builtin-sched.c | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-)Developed with AI assistance (Claude/sashiko), tagged in commits.
Thanks a lot,
- Arnaldo