diff options
| author | Yabin Cui <yabinc@google.com> | 2015-04-14 20:34:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-14 20:34:27 +0000 |
| commit | 7369d314d255afc1df5f7cf343785cc942042852 (patch) | |
| tree | 8bc6d416f39e8f8f6146f56aa2d1d10384ce8897 | |
| parent | 35d09b6928d77d619d95d87f6fe16eaedc99a954 (diff) | |
| parent | 03dca28def9303467ec6f28d43e90d465b816475 (diff) | |
| download | system_core-7369d314d255afc1df5f7cf343785cc942042852.zip system_core-7369d314d255afc1df5f7cf343785cc942042852.tar.gz system_core-7369d314d255afc1df5f7cf343785cc942042852.tar.bz2 | |
Merge "Fix alignment when reading note segment."
| -rw-r--r-- | debuggerd/elf_utils.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp index 764b9db..5ea03e7 100644 --- a/debuggerd/elf_utils.cpp +++ b/debuggerd/elf_utils.cpp @@ -29,6 +29,8 @@ #include "elf_utils.h" +#define NOTE_ALIGN(size) ((size + 3) & ~3) + template <typename HdrType, typename PhdrType, typename NhdrType> static bool get_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); if (nhdr.n_type == NT_GNU_BUILD_ID) { // 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]; if (nhdr.n_namesz > sizeof(build_id_data)) { ALOGE("Possible corrupted note, name size value is too large: %u", @@ -80,7 +82,7 @@ static bool get_build_id( } else { // Move past the extra note data. 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; if (hdr_size < skip_bytes) { break; |