perf powerpc-vpadtl: Fix raw_size of DTL samples
PATCH 1/1 perf powerpc-vpadtl: Fix raw_size of DTL samples
In powerpc_vpadtl_sample(), raw_data of the synthetic sample points to a struct powerpc_vpadtl_entry (48 bytes), but raw_size is set to sizeof(record). record is a struct powerpc_vpadtl_entry pointer, so sizeof(record) is the size of the pointer (8 bytes on 64-bit) rather than the size of the record itself.
As a result, consumers that bound their access to raw_data by raw_size only see or copy the first 8 bytes of each DTL entry instead of the full record.
Use sizeof(*record) so that raw_size reflects the actual length of the raw data.
--- tools/perf/util/powerpc-vpadtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/powerpc-vpadtl.c +1 -1
@@ -196,7 +196,7 @@ static int powerpc_vpadtl_sample(struct powerpc_vpadtl_entry *record, sample.cpumode =PERF_RECORD_MISC_KERNEL ; sample.time = save; sample.raw_data = record; - sample.raw_size =sizeof (record); + sample.raw_size =sizeof (*record); event.sample.header.type =PERF_RECORD_SAMPLE ; event.sample.header.misc = sample.cpumode; event.sample.header.size =sizeof (struct perf_event_header );
Signature · 1 line
2.25.1
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Missing bounds check in perf_sample__fprintf_synth_vpadtl allows out-of-bounds reads and array overflows.
- [High] Integer underflow and out-of-bounds read in powerpc_vpadtl_decode_all leading to infinite loop and memory leak. --
--- Patch [1]: [PATCH] perf powerpc-vpadtl: Fix raw_size of DTL samples --- commit 757f0f4d0a4831a576dcdc38cfd2b1f9262aa2e3
Author: Wang Yan <[email protected]>
Subject: perf powerpc-vpadtl: Fix raw_size of DTL samples
This commit fixes an issue where raw_size of DTL samples was incorrectly set to the pointer size rather than the record size. This caused consumers to only copy the first 8 bytes of each entry instead of the full record. The fix uses sizeof(*record) so that raw_size reflects the actual length.
tools/perf/util/powerpc-vpadtl.c static int powerpc_vpadtl_sample(struct powerpc_vpadtl_entry *record, · line 199
Quoted 10 lines
tools/perf/util/powerpc-vpadtl.c +1
-1@@ -196,7 +196,7 @@ static int powerpc_vpadtl_sample(struct powerpc_vpadtl_entry *record, sample.cpumode =PERF_RECORD_MISC_KERNEL ; sample.time = save; sample.raw_data = record; - sample.raw_size =sizeof (record); + sample.raw_size =sizeof (*record);
[Severity: High]
This is a pre-existing issue, but could this lead to out-of-bounds array reads when processing older or malformed perf.data files?
If an older file was recorded before this patch (where raw_size is 8), could perf_sample__fprintf_synth_vpadtl() read beyond the provided raw_data when accessing fields like timebase?
Additionally, if the dispatch_reason or preempt_reason values from an untrusted file are not validated, could they cause out-of-bounds reads on the dispatch_reasons and preempt_reasons arrays?
tools/perf/builtin-script.c:perf_sample__fprintf_synth_vpadtl() {
...
len = fprintf(fp, "timebase: %" PRIu64 " dispatch_reason:%s, preempt_reason:%s,\n"
"enqueue_to_dispatch_time:%d, ready_to_enqueue_time:%d,"
"waiting_to_ready_time:%d, processor_id: %d",
get_unaligned_be64(&dtl->timebase),
dispatch_reasons[dtl->dispatch_reason],
preempt_reasons[dtl->preempt_reason],
...
}[Severity: High]
This is a pre-existing issue, but could a small auxtrace buffer trigger an integer underflow and an infinite loop?
If an auxtrace buffer is provided that is smaller than 48 bytes, it appears buf_len will be initialized to 0 here:
tools/perf/util/powerpc-vpadtl.c:powerpc_vpadtl_get_buffer() {
...
vpaq->buf_len = buffer->size;
if (buffer->size % dtl_entry_size)
vpaq->buf_len = buffer->size - (buffer->size % dtl_entry_size);
...
}Then later, if the timebase is positive, powerpc_vpadtl_decode_all() will subtract dtl_entry_size (48) from buf_len without checking if it is 0:
tools/perf/util/powerpc-vpadtl.c:powerpc_vpadtl_decode_all() {
...
if (vpaq->buffer) {
buf = vpaq->buffer->data;
buf += vpaq->pkt_len;
vpaq->dtl = (struct powerpc_vpadtl_entry *)buf;
if ((long long)be64_to_cpu(vpaq->dtl->timebase) <= 0) {
...
}
vpaq->pkt_len += dtl_entry_size;
vpaq->buf_len -= dtl_entry_size;
...
}Could this underflow buf_len, bypass the buffer reload logic, and result in an infinite loop that sequentially reads out-of-bounds heap memory?
Quoted 3 lines
tools/perf/util/powerpc-vpadtl.c +0
-0event.sample.header.type =PERF_RECORD_SAMPLE ; event.sample.header.misc = sample.cpumode; event.sample.header.size =sizeof (struct perf_event_header );
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 14 lines · Wang Yan
In
powerpc_vpadtl_sample(),raw_dataof the synthetic sample points to a structpowerpc_vpadtl_entry(48 bytes), butraw_sizeis set to sizeof(record). record is a structpowerpc_vpadtl_entrypointer, so sizeof(record) is the size of the pointer (8 bytes on 64-bit) rather than the size of the record itself.As a result, consumers that bound their access to
raw_databyraw_sizeonly see or copy the first 8 bytes of each DTL entry instead of the full record.
Quoted 5 lines
Use
sizeof(*record)so thatraw_sizereflects the actual length of the raw data.Fixes 8644834a482a ("perf powerpc: Process the DTL entries in queue and deliver samples")Signed-off-by Wang Yan <[email protected]>
Thanks
Athira
Quoted 20 lines
---
tools/perf/util/powerpc-vpadtl.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/powerpc-vpadtl.c +1
-1@@ -196,7 +196,7 @@ static int powerpc_vpadtl_sample(struct powerpc_vpadtl_entry *record, sample.cpumode =PERF_RECORD_MISC_KERNEL ; sample.time = save; sample.raw_data = record; - sample.raw_size =sizeof (record); + sample.raw_size =sizeof (*record); event.sample.header.type =PERF_RECORD_SAMPLE ; event.sample.header.misc = sample.cpumode; event.sample.header.size =sizeof (struct perf_event_header );Signature · 1 line
2.25.1
Quoted 12 lines · Athira Rajeev
Quoted 12 lines · Wang Yan
In
powerpc_vpadtl_sample(),raw_dataof the synthetic sample points to a structpowerpc_vpadtl_entry(48 bytes), butraw_sizeis set to sizeof(record). record is a structpowerpc_vpadtl_entrypointer, so sizeof(record) is the size of the pointer (8 bytes on 64-bit) rather than the size of the record itself.As a result, consumers that bound their access to
raw_databyraw_sizeonly see or copy the first 8 bytes of each DTL entry instead of the full record.
Quoted 7 lines
Quoted 5 lines
Use
sizeof(*record)so thatraw_sizereflects the actual length of the raw data.Fixes 8644834a482a ("perf powerpc: Process the DTL entries in queue and deliver samples")Signed-off-by Wang Yan <[email protected]>Reviewed-by Athira Rajeev <[email protected]>
Namhyung, I think this is v7.3 material.
- Arnaldo
Quoted 11 lines · Wang Yan
In
powerpc_vpadtl_sample(),raw_dataof the synthetic sample points to a structpowerpc_vpadtl_entry(48 bytes), butraw_sizeis set to sizeof(record). record is a structpowerpc_vpadtl_entrypointer, so sizeof(record) is the size of the pointer (8 bytes on 64-bit) rather than the size of the record itself.As a result, consumers that bound their access to
raw_databyraw_sizeonly see or copy the first 8 bytes of each DTL entry instead of the full record.[...]
Applied to perf-tools, thanks!
Best regards,
Namhyung