From patchwork Sat Jan 28 00:08:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksei Vetrov via Libabigail X-Patchwork-Id: 63826 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 82B1A3858C50 for ; Sat, 28 Jan 2023 00:08:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82B1A3858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674864531; bh=8eNbnBo8AlNTgzrxPA0rJtUBfvIo3HbFLSldP4Phpek=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Help:List-Subscribe:From:Reply-To:From; b=brWD4jHxdJTduutbBApDNILsiltPzCETedqP4vzRihdzKQDBeWUQxBJ/nROTiKsrR Nm0Ddes/e+2cu7SgujA2Sl7nteW+am9WU4hUygA7ZAtw4QxzDCcePw9QZ5Ny/tAraY wR3Ncw05X/HXwGPQn2B572nTb1zyHS7B029fKuOQ= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by sourceware.org (Postfix) with ESMTPS id 8CB723858D20 for ; Sat, 28 Jan 2023 00:08:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8CB723858D20 Received: by mail-wm1-x34a.google.com with SMTP id l31-20020a05600c1d1f00b003da8b330db2so4114501wms.1 for ; Fri, 27 Jan 2023 16:08:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8eNbnBo8AlNTgzrxPA0rJtUBfvIo3HbFLSldP4Phpek=; b=dhtVImKjMXv0gKvQhadQMRGUvERJgT2tt9zqRXrZcdsNpmVXR5fXgikhmf7+rfYPvd 24fHSyHgaY8rzbSJxi9GaVw6Dh/vLeFAUUTCWlX8/LM094ScZkyib8/qRwJ5zsFbeG2F 81G1n/hh9IT9d6d3b/lEnMpxNyz8MQTnqaPGCfXMQr7LYiVdsVhkhDkgO2+HfXEYJfMp g2eLO0JVa2w5t/CN99Y5+ZJ6Ma9wS8uNdPmBBdzsJrqa9tBQ61yNNrGRzdybhYFUYsyW H12xDsNPYXEjnjRVSGN+qPDo4DNV4tbgfxrzIWixviradvr624RHITbGfWKYSUfyklbf 8iPQ== X-Gm-Message-State: AO0yUKVXK8eLtqD+Ag0SNFqf5j2qJKX2Leb9MBTuMNUG4Zwfim6wf5QB Gmu+wtoJH3FO+O8jL5uerkQBXYYCmnY2e+F2CA21lXUxsg9ImJmmNua0lg8Ce2HOLH8XRxk6sdc a7u+0XlJWD1HfeHM6hZ7tbbBtQWmsI9Psr7yd8D7R4vpEhY0fKQW/QfR+vj7P168OkQ== X-Google-Smtp-Source: AK7set+GULRiX3rp+DJMMSnsI6ym2a+S+IxVj57D8CAZwMUrrtdygrIMhC9EEU9qCMhBb1jNrd2p1lPIab4= X-Received: from vvvvvv-dev.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:472]) (user=vvvvvv job=sendgmr) by 2002:a05:600c:5564:b0:3cf:6f23:a3e3 with SMTP id ja4-20020a05600c556400b003cf6f23a3e3mr31621wmb.1.1674864519633; Fri, 27 Jan 2023 16:08:39 -0800 (PST) Date: Sat, 28 Jan 2023 00:08:18 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230128000818.1605970-1-vvvvvv@google.com> Subject: [PATCH] symtab: fix getting CRC in relocatable modules To: libabigail@sourceware.org Cc: kernel-team@android.com, maennich@google.com, vvvvvv@google.com X-Spam-Status: No, score=-21.1 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Aleksei Vetrov via Libabigail From: Aleksei Vetrov via Libabigail Reply-To: vvvvvv@google.com Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" From: Aleksei Vetrov 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. Signed-off-by: Aleksei Vetrov --- src/abg-elf-helpers.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc index 5d8e3188..d61114bf 100644 --- a/src/abg-elf-helpers.cc +++ b/src/abg-elf-helpers.cc @@ -920,10 +920,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; } @@ -940,10 +941,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;