diff options
| author | Christopher Ferris <cferris@google.com> | 2015-10-22 13:34:48 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-12-10 16:11:59 -0800 |
| commit | d167d5eabc794ba4ddef1a2900eb729720da84a2 (patch) | |
| tree | e8ad34c136ad6c8fd283aaee582e0e2cef0d0f77 | |
| parent | 5b73585385cfb1389e060a147743b380857e8a17 (diff) | |
| download | core-d167d5eabc794ba4ddef1a2900eb729720da84a2.tar.gz | |
Fix incorrect check of descsz value.android-6.0.1_r12android-6.0.1_r11
Bug: 25187394
(cherry picked from commit 1fa55234d6773e09e3bb934419b5b6cc0df981c9)
Change-Id: Idbc9071e8b2b25a062c4e94118808d6e19d443d9
| -rw-r--r-- | debuggerd/elf_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp index 5ea03e752..65c190479 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) { |