diff options
| author | Aleksei Vetrov <vvvvvv@google.com> | 2023-01-27 23:42:03 +0000 |
|---|---|---|
| committer | Aleksei Vetrov <vvvvvv@google.com> | 2023-01-27 23:51:23 +0000 |
| commit | 500c5b730574f3175d23f2939a02b9c0dd8340be (patch) | |
| tree | 69a013ee4366f78ac2b990644f9aba4ac5b1d39f | |
| parent | edc8f44d4fe4b9bef34bb823f2fd295606b48082 (diff) | |
| download | libabigail-500c5b730574f3175d23f2939a02b9c0dd8340be.tar.gz | |
symtab: fix getting CRC in relocatable modules
In ELF with ET_REL type symbol value holds not absolute but relative to
section value. This patch applies adjustment to the address, used in CRC
value extraction.
* src/abg-elf-helpers.cc (get_crc_for_symbol): Rename
crc_symbol_value to crc_symbol_address and adjust it for
relocatable ELF types.
Change-Id: Iff28e7eaf2a1c95630116ad5fdf83ea007aeeba5
Signed-off-by: Aleksei Vetrov <vvvvvv@google.com>
| -rw-r--r-- | src/abg-elf-helpers.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc index a1c5fb5d..8345d5d2 100644 --- a/src/abg-elf-helpers.cc +++ b/src/abg-elf-helpers.cc @@ -918,10 +918,11 @@ bool get_crc_for_symbol(Elf* elf_handle, GElf_Sym* crc_symbol, uint32_t& crc_value) { size_t crc_section_index = crc_symbol->st_shndx; - uint64_t crc_symbol_value = crc_symbol->st_value; + GElf_Addr crc_symbol_address = + maybe_adjust_et_rel_sym_addr_to_abs_addr(elf_handle, crc_symbol); if (crc_section_index == SHN_ABS) { - crc_value = crc_symbol_value; + crc_value = crc_symbol_address; return true; } @@ -938,10 +939,10 @@ get_crc_for_symbol(Elf* elf_handle, GElf_Sym* crc_symbol, uint32_t& crc_value) if (kcrctab_data == NULL) return false; - if (crc_symbol_value < sheader->sh_addr) + if (crc_symbol_address < sheader->sh_addr) return false; - size_t offset = crc_symbol_value - sheader->sh_addr; + size_t offset = crc_symbol_address - sheader->sh_addr; if (offset + sizeof(uint32_t) > kcrctab_data->d_size || offset + sizeof(uint32_t) > sheader->sh_size) return false; |