diff options
author | Aleksei Vetrov <vvvvvv@google.com> | 2022-11-21 15:38:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-21 15:38:43 +0000 |
commit | 5e935f896372d512f562bf0c65736552b0bc05af (patch) | |
tree | 5be8b02d63f982c303913b767e031e694f2b2b37 | |
parent | 5810e65154ed982985d91c5e993db07047645312 (diff) | |
parent | e815751a9d070feeaec5c50558840e0b689c2140 (diff) | |
download | libabigail-5e935f896372d512f562bf0c65736552b0bc05af.tar.gz |
symtab: add support for CRC values from __kcrctab am: ad0feffef0 am: e815751a9d
Original change: https://android-review.googlesource.com/c/platform/external/libabigail/+/2300221
Change-Id: I97a5171cf3fcd16e894f6bec6b01c5badad8227e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/abg-elf-helpers.cc | 47 | ||||
-rw-r--r-- | src/abg-elf-helpers.h | 3 | ||||
-rw-r--r-- | src/abg-symtab-reader.cc | 5 |
3 files changed, 54 insertions, 1 deletions
diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc index 2a2cc6c2..a1c5fb5d 100644 --- a/src/abg-elf-helpers.cc +++ b/src/abg-elf-helpers.cc @@ -905,6 +905,53 @@ get_version_for_symbol(Elf* elf_handle, return false; } +/// Return the CRC from the "__crc_" symbol. +/// +/// @param elf_handle the elf handle to use. +/// +/// @param crc_symbol symbol containing CRC value. +/// +/// @param crc_value the CRC found for @p crc_symbol. +/// +/// @return true iff a CRC was found for given @p crc_symbol. +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; + if (crc_section_index == SHN_ABS) + { + crc_value = crc_symbol_value; + return true; + } + + Elf_Scn* kcrctab_section = elf_getscn(elf_handle, crc_section_index); + if (kcrctab_section == NULL) + return false; + + GElf_Shdr sheader_mem; + GElf_Shdr* sheader = gelf_getshdr(kcrctab_section, &sheader_mem); + if (sheader == NULL) + return false; + + Elf_Data* kcrctab_data = elf_rawdata(kcrctab_section, NULL); + if (kcrctab_data == NULL) + return false; + + if (crc_symbol_value < sheader->sh_addr) + return false; + + size_t offset = crc_symbol_value - sheader->sh_addr; + if (offset + sizeof(uint32_t) > kcrctab_data->d_size + || offset + sizeof(uint32_t) > sheader->sh_size) + return false; + + crc_value = *reinterpret_cast<uint32_t*>( + reinterpret_cast<char*>(kcrctab_data->d_buf) + offset); + + return true; +} + /// Test if the architecture of the current binary is ppc64. /// /// @param elf_handle the ELF handle to consider. diff --git a/src/abg-elf-helpers.h b/src/abg-elf-helpers.h index 0dc987d4..4688216a 100644 --- a/src/abg-elf-helpers.h +++ b/src/abg-elf-helpers.h @@ -141,6 +141,9 @@ get_version_for_symbol(Elf* elf_handle, bool get_def_version, elf_symbol::version& version); +bool +get_crc_for_symbol(Elf* elf_handle, GElf_Sym* crc_symbol, uint32_t& crc_value); + // // Architecture specific helpers // diff --git a/src/abg-symtab-reader.cc b/src/abg-symtab-reader.cc index 60ed4a42..ccf4683e 100644 --- a/src/abg-symtab-reader.cc +++ b/src/abg-symtab-reader.cc @@ -314,7 +314,10 @@ symtab::load_(Elf* elf_handle, } if (is_kernel && name.rfind("__crc_", 0) == 0) { - ABG_ASSERT(crc_values.emplace(name.substr(6), sym->st_value).second); + uint32_t crc_value; + ABG_ASSERT(elf_helpers::get_crc_for_symbol(elf_handle, + sym, crc_value)); + ABG_ASSERT(crc_values.emplace(name.substr(6), crc_value).second); continue; } if (strings_section && is_kernel && name.rfind("__kstrtabns_", 0) == 0) |