summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-10-29 19:12:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-29 19:12:37 +0000
commit69406d904abffcfd5addf14dc96584f73ab04ff5 (patch)
tree836c1c358842a05e13e72019cb39d487acd99f8e
parent2b216aa89b76dbadb315322e4fd31aa37059b262 (diff)
parentd917514bd6b270df431ea4e781a865764d406120 (diff)
downloadsystem_core-69406d904abffcfd5addf14dc96584f73ab04ff5.zip
system_core-69406d904abffcfd5addf14dc96584f73ab04ff5.tar.gz
system_core-69406d904abffcfd5addf14dc96584f73ab04ff5.tar.bz2
Fix incorrect check of descsz value.
am: d917514bd6 * commit 'd917514bd6b270df431ea4e781a865764d406120': Fix incorrect check of descsz value.
-rw-r--r--debuggerd/elf_utils.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp
index 5ea03e7..65c1904 100644
--- a/debuggerd/elf_utils.cpp
+++ b/debuggerd/elf_utils.cpp
@@ -63,10 +63,10 @@ static bool get_build_id(
if (nhdr.n_type == NT_GNU_BUILD_ID) {
// Skip the name (which is the owner and should be "GNU").
addr += NOTE_ALIGN(nhdr.n_namesz);
- uint8_t build_id_data[128];
- if (nhdr.n_namesz > sizeof(build_id_data)) {
- ALOGE("Possible corrupted note, name size value is too large: %u",
- nhdr.n_namesz);
+ uint8_t build_id_data[160];
+ if (nhdr.n_descsz > sizeof(build_id_data)) {
+ ALOGE("Possible corrupted note, desc size value is too large: %u",
+ nhdr.n_descsz);
return false;
}
if (backtrace->Read(addr, build_id_data, nhdr.n_descsz) != nhdr.n_descsz) {