perf header: Validate build_id filename length to prevent buffer overflow
PATCH v2 1/1 perf header: Validate build_id filename length to prevent buffer overflow
The build_id parsing functions calculate a filename length from the event header size and read directly into a stack buffer of PATH_MAX bytes without bounds checking. A malformed perf.data file with a crafted header.size can cause the length to be negative or exceed PATH_MAX, resulting in a stack buffer overflow.
Add bounds checking for the filename length in both perf_header__read_build_ids() and the ABI quirk variant. Print a warning message when invalid length is detected.
---
v2:
- Add warning message when invalid filename length detected
--- tools/perf/util/header.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/perf/util/header.c +10 -0
@@ -2545,6 +2545,11 @@ static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,perf_event_header__bswap (&old_bev.header); len = old_bev.header.size -sizeof (old_bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); +return -1 ; + } +if (readn (input, filename, len) != len)return -1 ;
@@ -2587,6 +2592,11 @@ static int perf_header__read_build_ids(struct perf_header *header,perf_event_header__bswap (&bev.header); len = bev.header.size -sizeof (bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); + goto out; + } +if (readn (input, filename, len) != len) goto out;/*
Signature · 1 line
2.52.0
Quoted 7 lines · SeungJu Cheon
The
build_idparsing functions calculate a filename length from the event header size and read directly into a stack buffer ofPATH_MAXbytes without bounds checking. A malformed perf.data file with a crafted header.size can cause the length to be negative or exceedPATH_MAX, resulting in a stack buffer overflow.
Quoted 5 lines
Add bounds checking for the filename length in both
perf_header__read_build_ids()and the ABI quirk variant. Print a warning message when invalid length is detected.Signed-off-by SeungJu Cheon <[email protected]>
Thanks,
Ian
Quoted 38 lines
---
v2:
- Add warning message when invalid filename length detected--- tools/perf/util/header.c | 10 ++++++++++ 1 file changed, 10 insertions(+)tools/perf/util/header.c +10
-1@@ -2545,6 +2545,11 @@ static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,perf_event_header__bswap (&old_bev.header); len = old_bev.header.size -sizeof (old_bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); +return -1 ; + } +if (readn (input, filename, len) != len)return -1 ;@@ -2587,6 +2592,11 @@ static int perf_header__read_build_ids(struct perf_header *header,perf_event_header__bswap (&bev.header); len = bev.header.size -sizeof (bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); + goto out; + } +if (readn (input, filename, len) != len) goto out;/* -- 2.52.0
Ian Rogers
reviewerQuoted 9 lines · Ian Rogers
Quoted 7 lines · SeungJu Cheon
The
build_idparsing functions calculate a filename length from the event header size and read directly into a stack buffer ofPATH_MAXbytes without bounds checking. A malformed perf.data file with a crafted header.size can cause the length to be negative or exceedPATH_MAX, resulting in a stack buffer overflow.
Quoted 7 lines
Quoted 5 lines
Add bounds checking for the filename length in both
perf_header__read_build_ids()and the ABI quirk variant. Print a warning message when invalid length is detected.Signed-off-by SeungJu Cheon <[email protected]>Reviewed-by Ian Rogers <[email protected]>
Sashiko spotted some additional nits:
https://sashiko.dev/#/patchset/20260401215310.348463-1-suunj1331%40gmail.com
printf flags, potential for no '\0' termination and reads of uninitialized memory.
Thanks,
Ian
Quoted 41 lines
Thanks,
IanQuoted 38 lines
---
v2:
- Add warning message when invalid filename length detected--- tools/perf/util/header.c | 10 ++++++++++ 1 file changed, 10 insertions(+)tools/perf/util/header.c +10
-1@@ -2545,6 +2545,11 @@ static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,perf_event_header__bswap (&old_bev.header); len = old_bev.header.size -sizeof (old_bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); +return -1 ; + } +if (readn (input, filename, len) != len)return -1 ;@@ -2587,6 +2592,11 @@ static int perf_header__read_build_ids(struct perf_header *header,perf_event_header__bswap (&bev.header); len = bev.header.size -sizeof (bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); + goto out; + } +if (readn (input, filename, len) != len) goto out;/* -- 2.52.0
Namhyung Kim
maintainerHello,
Quoted 23 lines · SeungJu Cheon
The
build_idparsing functions calculate a filename length from the event header size and read directly into a stack buffer ofPATH_MAXbytes without bounds checking. A malformed perf.data file with a crafted header.size can cause the length to be negative or exceedPATH_MAX, resulting in a stack buffer overflow.Add bounds checking for the filename length in both
perf_header__read_build_ids()and the ABI quirk variant. Print a warning message when invalid length is detected.Signed-off-by SeungJu Cheon <[email protected]>---
v2:
- Add warning message when invalid filename length detected--- tools/perf/util/header.c | 10 ++++++++++ 1 file changed, 10 insertions(+)tools/perf/util/header.c +0
-0
tools/perf/util/header.c static int perf_header__read_build_ids_abi_quirk(struct perf_header *header, · line 2550
Quoted 6 lines
tools/perf/util/header.c +3
-0@@ -2545,6 +2545,11 @@ static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,perf_event_header__bswap (&old_bev.header); len = old_bev.header.size -sizeof (old_bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); +return -1 ;
I got this errors:
In file included from util/header.c:38:
util/header.c: In function 'perf_header__read_build_ids_abi_quirk':
util/header.c:2549:36: error: format '%d' expects argument of type 'int', but argument 4 has type 'ssize_t' {aka 'long int'} [-Werror=format =]
2549 | pr_warning("invalid build_id filename length %d\n", len);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/debug.h:20:21: note: in definition of macro 'pr_fmt'
20 | #define pr_fmt(fmt) fmt
| ^~~
util/header.c:2549:25: note: in expansion of macro 'pr_warning'
2549 | pr_warning("invalid build_id filename length %d\n", len);
| ^~~~~~~~~~
util/header.c:2549:71: note: format string is defined here
2549 | pr_warning("invalid build_id filename length %d\n", len);
| ~^
| |
| int
| %ldPlease make sure it builds before sending patches. Hopefully we can run perf test before and after your changes to see if there's anything broken.
I'll fix it up this time.
Thanks,
Namhyung
Quoted 20 lines
tools/perf/util/header.c +7
-0+ } +if (readn (input, filename, len) != len)return -1 ;@@ -2587,6 +2592,11 @@ static int perf_header__read_build_ids(struct perf_header *header,perf_event_header__bswap (&bev.header); len = bev.header.size -sizeof (bev); +if (len <0 || len >=PATH_MAX ) { +pr_warning ("invalid build_id filename length %d\n" , len); + goto out; + } +if (readn (input, filename, len) != len) goto out;/* Signature · 1 line
2.52.0