Commit 1511e469 authored by Yang Jihong's avatar Yang Jihong Committed by Arnaldo Carvalho de Melo

perf symbols: Fix return incorrect build_id size in elf_read_build_id()

In elf_read_build_id(), if gnu build_id is found, should return the size of
the actually copied data. If descsz is greater thanBuild_ID_SIZE,
write_buildid data access may occur.

Fixes: be96ea8f ("perf symbols: Fix issue with binaries using 16-bytes buildids (v2)")
Reported-by: default avatarWill Ochowicz <Will.Ochowicz@genusplc.com>
Signed-off-by: default avatarYang Jihong <yangjihong1@huawei.com>
Tested-by: default avatarWill Ochowicz <Will.Ochowicz@genusplc.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/lkml/CWLP265MB49702F7BA3D6D8F13E4B1A719C649@CWLP265MB4970.GBRP265.PROD.OUTLOOK.COM/T/
Link: https://lore.kernel.org/r/20230427012841.231729-1-yangjihong1@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6a7b57d8
...@@ -886,7 +886,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size) ...@@ -886,7 +886,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size)
size_t sz = min(size, descsz); size_t sz = min(size, descsz);
memcpy(bf, ptr, sz); memcpy(bf, ptr, sz);
memset(bf + sz, 0, size - sz); memset(bf + sz, 0, size - sz);
err = descsz; err = sz;
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment