From patchwork Thu Apr 7 16:29:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 52712 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 9EBE93858002 for ; Thu, 7 Apr 2022 16:30:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9EBE93858002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1649349025; bh=xr0SHktFuRg9MAeVKCIoqziSCkC7twoo9/lbJIsmenY=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Q6FoP3+/sDQxfE/nwTv0sWiH8+vv8UQD2FYqarKGjQmEuw2V59Mm60YAUkZvPYLnH xPb+3qdnWKOBgO619TOvX0CUBGsh6A3Mt+eJhQwjHErFrAMbP+d7YdlSEDDoPJf+9/ t6T4d1gr/XNFBOYvyGe8dWtghw75EpXbL/cG75Ac= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-ej1-x649.google.com (mail-ej1-x649.google.com [IPv6:2a00:1450:4864:20::649]) by sourceware.org (Postfix) with ESMTPS id A4B9E3839816 for ; Thu, 7 Apr 2022 16:29:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A4B9E3839816 Received: by mail-ej1-x649.google.com with SMTP id mp18-20020a1709071b1200b006e7f314ecb3so3370032ejc.23 for ; Thu, 07 Apr 2022 09:29:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xr0SHktFuRg9MAeVKCIoqziSCkC7twoo9/lbJIsmenY=; b=weNrHAQ0bXIIRtrMsihZishYUlYfNZe6OVBcLe42KfPlLGCPcLkuO8FNw7Eao4/pFp 9yyar8pKDwPAl+fHjB+7bwYZJopzGfRkBacARbQDwlpYT+Rupg8gApKR5CWh2BqMqXKz +2sm9jiW7xPuJ6w4164xJBBr8YxGxQANatiM+wgyCES1evJgKwFlx4ehUnBRaH3Tg5lZ GyOknNrFyN8NBgGI2SBI67KWO7AwHqVizf99IU5V05r9BK1K7AWPkTNaMeKYUW5rx6Kh P5YbapGRrhabFgxmznLGPb2oTdsCdw3AwXT/m5fjMsFW6lfCAuPTXWJDCm4IF9Hwp8Nl 6IrQ== X-Gm-Message-State: AOAM532JpKI0XuC1ltFl2+Vb3e/o0Bm4NaT9AqdKEFSiUHdcievWWefs Hi8QV+slOq/aqx8zg9luLed8iFM9M858MZCzo7hRpcrrrbIyajwSjObJS+hbs1gCO1hcfIqyQC/ uikmpJtGCbrFbynwL7i0aH7jp45F1nEua/cSDU3Ig4WucmOiGIEa3ymBojenxQeBLuCXFOy4= X-Google-Smtp-Source: ABdhPJw+RxAaK23uCCBjpcF6AspcuksqvTjW1ABDvPPOfv+wyOTvWhDme/BM6lLkIKOJLVVXPiO+3ooowV4Cew== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:22d2:3f86:2861:f964]) (user=gprocida job=sendgmr) by 2002:a05:6402:1941:b0:413:2b7e:676e with SMTP id f1-20020a056402194100b004132b7e676emr15422028edz.114.1649348981272; Thu, 07 Apr 2022 09:29:41 -0700 (PDT) Date: Thu, 7 Apr 2022 17:29:26 +0100 In-Reply-To: <20220407162926.2076100-1-gprocida@google.com> Message-Id: <20220407162926.2076100-2-gprocida@google.com> Mime-Version: 1.0 References: <20220407162926.2076100-1-gprocida@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH 2/2] symtab: fix up 64-bit ARM address which may contain tags To: libabigail@sourceware.org X-Spam-Status: No, score=-21.5 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com, willdeacon@google.com Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" 64-bit ARM addresses normally have bits 47 to 63 as either all 0 or all 1. If tagging is used, bits 56 to 63 can vary, but the interpretation of such values is as if the bits were all the same as bit 55. Such tagging is used for HWASAN and this affects the ELF symbol values seen in shared libraries. This commit changes the interpretation of 64-bit ARM symbol values by unconditionally extending bit 55 into bits 56 to 63. This fixes missing types for symbols in HWASAN-compiled libraries. * src/abg-elf-helpers.cc: (architecture_is_arm64): Add helper. * src/abg-elf-helpers.h: Likewise. * src/abg-symtab-reader.cc: (get_symbol_value): Adjust 64-bit ARM symbol values by extending bit 55 into bits 56 to 63. Signed-off-by: Giuliano Procida --- src/abg-elf-helpers.cc | 17 +++++++++++++++++ src/abg-elf-helpers.h | 3 +++ src/abg-symtab-reader.cc | 6 ++++++ 3 files changed, 26 insertions(+) diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc index ee631831..787a05ff 100644 --- a/src/abg-elf-helpers.cc +++ b/src/abg-elf-helpers.cc @@ -900,6 +900,23 @@ architecture_is_arm32(Elf* elf_handle) return (elf_header && elf_header->e_machine == EM_ARM); } +/// Test if the architecture of the current binary is arm64. +/// +/// @param elf_handle the ELF handle to consider. +/// +/// @return true iff the architecture of the current binary is arm64. +bool +architecture_is_arm64(Elf* elf_handle) +{ +#ifdef HAVE_EM_AARCH64_MACRO + GElf_Ehdr eh_mem; + GElf_Ehdr* elf_header = gelf_getehdr(elf_handle, &eh_mem); + return (elf_header && elf_header->e_machine == EM_AARCH64); +#else + return false; +#endif +} + /// Test if the endianness of the current binary is Big Endian. /// /// https://en.wikipedia.org/wiki/Endianness. diff --git a/src/abg-elf-helpers.h b/src/abg-elf-helpers.h index 718ce9c1..afaff24a 100644 --- a/src/abg-elf-helpers.h +++ b/src/abg-elf-helpers.h @@ -147,6 +147,9 @@ architecture_is_ppc64(Elf* elf_handle); bool architecture_is_arm32(Elf* elf_handle); +bool +architecture_is_arm64(Elf* elf_handle); + bool architecture_is_big_endian(Elf* elf_handle); diff --git a/src/abg-symtab-reader.cc b/src/abg-symtab-reader.cc index 026988ee..3740cb7a 100644 --- a/src/abg-symtab-reader.cc +++ b/src/abg-symtab-reader.cc @@ -481,6 +481,7 @@ symtab::get_symbol_value(Elf* elf_handle, const elf_symbol_sptr& symbol_sptr) { const bool is_arm32 = elf_helpers::architecture_is_arm32(elf_handle); + const bool is_arm64 = elf_helpers::architecture_is_arm64(elf_handle); const bool is_ppc64 = elf_helpers::architecture_is_ppc64(elf_handle); GElf_Addr symbol_value = @@ -498,6 +499,11 @@ symtab::get_symbol_value(Elf* elf_handle, update_function_entry_address_symbol_map(elf_handle, elf_symbol, symbol_sptr); } + if (is_arm64) + // Copy bit 55 over bits 56 to 63 which may be tag information. + symbol_value = symbol_value & (1ULL<<55) + ? symbol_value | (0xffULL<<56) + : symbol_value &~ (0xffULL<<56); return symbol_value; }