ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix alignment when reading note segment."

Browse source
This commit is contained in:
Yabin Cui 2015-04-14 20:34:27 +00:00 • committed by Gerrit Code Review
commit 7369d314d2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/elf_utils.cpp
View file

@ -29,6 +29,8 @@
#include "elf_utils.h" #include "elf_utils.h"
#define NOTE_ALIGN(size) ((size + 3) & ~3)
template <typename HdrType, typename PhdrType, typename NhdrType> template <typename HdrType, typename PhdrType, typename NhdrType>
static bool get_build_id( static bool get_build_id(
Backtrace* backtrace, uintptr_t base_addr, uint8_t* e_ident, std::string* build_id) { Backtrace* backtrace, uintptr_t base_addr, uint8_t* e_ident, std::string* build_id) {
@ -60,7 +62,7 @@ static bool get_build_id(
addr += sizeof(nhdr); addr += sizeof(nhdr);
if (nhdr.n_type == NT_GNU_BUILD_ID) { if (nhdr.n_type == NT_GNU_BUILD_ID) {
// Skip the name (which is the owner and should be "GNU"). // Skip the name (which is the owner and should be "GNU").
addr += nhdr.n_namesz; addr += NOTE_ALIGN(nhdr.n_namesz);
uint8_t build_id_data[128]; uint8_t build_id_data[128];
if (nhdr.n_namesz > sizeof(build_id_data)) { if (nhdr.n_namesz > sizeof(build_id_data)) {
ALOGE("Possible corrupted note, name size value is too large: %u", ALOGE("Possible corrupted note, name size value is too large: %u",
@ -80,7 +82,7 @@ static bool get_build_id(
} else { } else {
// Move past the extra note data. // Move past the extra note data.
hdr_size -= sizeof(nhdr); hdr_size -= sizeof(nhdr);
size_t skip_bytes = nhdr.n_namesz + nhdr.n_descsz; size_t skip_bytes = NOTE_ALIGN(nhdr.n_namesz) + NOTE_ALIGN(nhdr.n_descsz);
addr += skip_bytes; addr += skip_bytes;
if (hdr_size < skip_bytes) { if (hdr_size < skip_bytes) {
break; break;