perf symbol-minimal: Be more defensive when reading build IDs
Ian Rogers
reviewerPATCH 1/1 perf symbol-minimal: Be more defensive when reading build IDs
The note_data at ptr is read as a nhdr but this may yield out-of-bounds reads if there isn't nhdrs worth of data. Be more defensive before doing the reads. This is motivated by address sanitizer capturing out of bounds reads running "perf top".
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/util/symbol-minimal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/symbol-minimal.c +1 -1
@@ -42,7 +42,7 @@ static int read_build_id(void *note_data, size_t note_len, struct build_id *bid,void *ptr; ptr = note_data; -while (ptr < (note_data + note_len)) { +while ((ptr +sizeof (*nhdr)) < (note_data + note_len)) {const char *name;size_t namesz, descsz;
Signature · 1 line
2.51.0.384.g4c02a37b29-goog
Quoted 4 lines · Ian Rogers
The
note_dataat ptr is read as a nhdr but this may yield out-of-bounds reads if there isn't nhdrs worth of data. Be more defensive before doing the reads. This is motivated by address sanitizer capturing out of bounds reads running "perf top".
Thanks, applied to perf-tools-next,
- Arnaldo
Quoted 20 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/symbol-minimal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/symbol-minimal.c +1
-1@@ -42,7 +42,7 @@ static int read_build_id(void *note_data, size_t note_len, struct build_id *bid,void *ptr; ptr = note_data; -while (ptr < (note_data + note_len)) { +while ((ptr +sizeof (*nhdr)) < (note_data + note_len)) {const char *name;size_t namesz, descsz;Signature · 1 line
2.51.0.384.g4c02a37b29-goog