Skip to content

Commit 1286e95

Browse files
acmelgregkh
authored andcommitted
perf symbols: Robustify reading of build-id from sysfs
[ Upstream commit 7934c98a6e04028eb34c1293bfb5a6b0ab630b66 ] Markus reported that perf segfaults when reading /sys/kernel/notes from a kernel linked with GNU gold, due to what looks like a gold bug, so do some bounds checking to avoid crashing in that case. Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de> Report-Link: http://lkml.kernel.org/r/20161219161821.GA294@x4 Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-ryhgs6a6jxvz207j2636w31c@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cc8b62f commit 1286e95

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

tools/perf/util/symbol-elf.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,12 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size)
488488
break;
489489
} else {
490490
int n = namesz + descsz;
491+
492+
if (n > (int)sizeof(bf)) {
493+
n = sizeof(bf);
494+
pr_debug("%s: truncating reading of build id in sysfs file %s: n_namesz=%u, n_descsz=%u.\n",
495+
__func__, filename, nhdr.n_namesz, nhdr.n_descsz);
496+
}
491497
if (read(fd, bf, n) != n)
492498
break;
493499
}

0 commit comments

Comments
 (0)