mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
perf synthetic-events: Bound check when synthesizing mmap2 and build_id events
Add robust boundary checks when synthesizing mmap2 and build_id events to ensure that filename fields do not overflow the fixed-size stack allocations or the synthesized event structures. Verify that the filename fits safely within the allocated boundaries of the mmap2 event structure, and prevent potential heap/stack overflow corruptions from excessively long or corrupted kernel filenames. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexandre Ghiti <alex@ghiti.fr> Cc: Andi Kleen <ak@linux.intel.com> Cc: Andrew Jones <ajones@ventanamicro.com> Cc: Anup Patel <anup@brainfault.org> Cc: Athira Rajeev <atrajeev@linux.ibm.com> Cc: Blake Jones <blakejones@google.com> Cc: Chen Ni <nichen@iscas.ac.cn> Cc: Chun-Tse Shao <ctshao@google.com> Cc: Dapeng Mi <dapeng1.mi@linux.intel.com> Cc: Derek Foreman <derek.foreman@collabora.com> Cc: Dmitriy Vyukov <dvyukov@google.com> Cc: Dr. David Alan Gilbert <linux@treblig.org> Cc: Howard Chu <howardchu95@gmail.com> Cc: Hrishikesh Suresh <hrishikesh123s@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Krzysztof Łopatowski <krzysztof.m.lopatowski@gmail.com> Cc: Leo Yan <leo.yan@arm.com> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Walmsley <pjw@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Quan Zhou <zhouquan@iscas.ac.cn> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Swapnil Sapkal <swapnil.sapkal@amd.com> Cc: Thomas Falcon <thomas.falcon@intel.com> Cc: Tianyou Li <tianyou.li@intel.com> Cc: Yujie Liu <yujie.liu@intel.com> Cc: tanze <tanze@kylinos.cn> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
b3ab668761
commit
e454fef5d2
|
|
@ -2268,14 +2268,20 @@ int perf_event__synthesize_build_id(const struct perf_tool *tool,
|
|||
const char *filename)
|
||||
{
|
||||
union perf_event ev;
|
||||
size_t len;
|
||||
size_t len, filename_len = strlen(filename);
|
||||
u64 sample_type = sample->evsel ? sample->evsel->core.attr.sample_type : 0;
|
||||
void *array = &ev;
|
||||
int ret;
|
||||
|
||||
len = sizeof(ev.build_id) + strlen(filename) + 1;
|
||||
if (filename_len >= PATH_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
len = sizeof(ev.build_id) + filename_len + 1;
|
||||
len = PERF_ALIGN(len, sizeof(u64));
|
||||
|
||||
if (len + MAX_ID_HDR_ENTRIES * sizeof(__u64) > sizeof(ev))
|
||||
return -E2BIG;
|
||||
|
||||
memset(&ev, 0, len);
|
||||
|
||||
ev.build_id.size = bid->size;
|
||||
|
|
@ -2314,14 +2320,21 @@ int perf_event__synthesize_mmap2_build_id(const struct perf_tool *tool,
|
|||
const char *filename)
|
||||
{
|
||||
union perf_event ev;
|
||||
size_t filename_len = strlen(filename);
|
||||
size_t ev_len;
|
||||
u64 sample_type = sample->evsel ? sample->evsel->core.attr.sample_type : 0;
|
||||
void *array;
|
||||
int ret;
|
||||
|
||||
ev_len = sizeof(ev.mmap2) - sizeof(ev.mmap2.filename) + strlen(filename) + 1;
|
||||
if (filename_len >= sizeof(ev.mmap2.filename))
|
||||
return -EINVAL;
|
||||
|
||||
ev_len = sizeof(ev.mmap2) - sizeof(ev.mmap2.filename) + filename_len + 1;
|
||||
ev_len = PERF_ALIGN(ev_len, sizeof(u64));
|
||||
|
||||
if (ev_len + MAX_ID_HDR_ENTRIES * sizeof(__u64) > sizeof(ev))
|
||||
return -E2BIG;
|
||||
|
||||
memset(&ev, 0, ev_len);
|
||||
|
||||
ev.mmap2.header.type = PERF_RECORD_MMAP2;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user