From patchwork Sun May 1 06:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 53373 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 249FB3857C4A for ; Sun, 1 May 2022 06:08:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 249FB3857C4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1651385332; bh=D/hnyaBa1yj3rymzhtJmxPnqLjx5J80MTizzet/tus8=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=uj3GS2/vXEgOIHlH2b0oEjkrvMoG3XxJ0T5+J7zEoGLoA8zSuKwLx1MvooJ7IXYi1 sx5tT1uhqNCbEnoWss/1HxoT3tvI04Mm8zmbH4v6jZVByPkTYZVeQXPg5xWtlSdvwf NVTaE04ijMyz2peRcnUqpgox0Wxa5YGCHm4N/+R8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by sourceware.org (Postfix) with ESMTPS id 4E1103857404 for ; Sun, 1 May 2022 06:07:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4E1103857404 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2f8bbaa6b16so50190177b3.14 for ; Sat, 30 Apr 2022 23:07:08 -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=D/hnyaBa1yj3rymzhtJmxPnqLjx5J80MTizzet/tus8=; b=f77mj0hOAFM3j+yMEjG2/bIzdafTPjg1lZRosjgejFm2z/VC7etJgkeLVNJy4RfKt5 Lpwt29SGenUETc2fDzRfSChdYV4riS3O2JwrxbsENlC2yR3BhhFhVhycrh/F7PZPVVAd 8ynLlMjjxdwggeYg2/V9XD4Z34M83dOAITrFBQn7qO6rPwGgZ5KVZUwIN5D22DPF3XGb hSv0Wv1R979vyj+TmWsftwECw7D0DUviMUmL9oaD5xHOEPK+wu7uOgG4US8pl9NuspRW mRnSXUFUgFji4avzspJ0wp8m8KSkFurwK1R8u2/i2d8gCHRZ7gIvPSvi6xf0mLzKo/ep wWog== X-Gm-Message-State: AOAM532itrT1GNA4Yu7L3FbUN2VbasWMfWNuS/UjNGNi7Atu3hnHonTl sYZ8KnQV25/QsKwNseHcFPmHl6pZcHk4rLZAYqrZGOqISY+Y/Y0l4WemIc9cBvHFA+7irRZ1oru O95cMIIrQDp1d0ZMFpyjyIhxg/i2Qi5W8AqmjmONSnQNHpxUICy7WjfXuM4kyRwCkkn9U X-Google-Smtp-Source: ABdhPJzcni07MEqv1mBs5v04woVApYj4iK8nLF4+cZT/oBV9w6gIFywWkEWKnURr7zDB5uLmsJQSzxJRPWgb X-Received: from maskray1.svl.corp.google.com ([2620:15c:2ce:200:a6bd:e82a:7b1:cc1]) (user=maskray job=sendgmr) by 2002:a0d:cbce:0:b0:2f8:29f6:2839 with SMTP id n197-20020a0dcbce000000b002f829f62839mr6566536ywd.89.1651385227767; Sat, 30 Apr 2022 23:07:07 -0700 (PDT) Date: Sat, 30 Apr 2022 23:06:15 -0700 In-Reply-To: <20220501060615.1694317-1-maskray@google.com> Message-Id: <20220501060615.1694317-4-maskray@google.com> Mime-Version: 1.0 References: <20220501060615.1694317-1-maskray@google.com> Subject: [PATCH 3/3] Revert "[ARM][BZ #17711] Fix extern protected data handling" To: libc-alpha@sourceware.org, Adhemerval Zanella , Szabolcs Nagy X-Spam-Status: No, score=-19.4 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Fangrui Song via Libc-alpha From: Fangrui Song Reply-To: Fangrui Song Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This reverts commit 3bcea719ddd6ce399d7bccb492c40af77d216e42. Reviewed-by: Szabolcs Nagy --- sysdeps/arm/dl-machine.h | 10 +++------- sysdeps/arm/dl-sysdep.h | 2 -- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index a7898bf420..2a7f795e46 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -212,22 +212,18 @@ _dl_start_user:\n\ TLS variable, so undefined references should not be allowed to define the value. ELF_RTYPE_CLASS_COPY iff TYPE should not be allowed to resolve to one - of the main executable's symbols, as for a COPY reloc. - ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA iff TYPE describes relocation against - protected data whose address may be external due to copy relocation. */ + of the main executable's symbols, as for a COPY reloc. */ #ifndef RTLD_BOOTSTRAP # define elf_machine_type_class(type) \ ((((type) == R_ARM_JUMP_SLOT || (type) == R_ARM_TLS_DTPMOD32 \ || (type) == R_ARM_TLS_DTPOFF32 || (type) == R_ARM_TLS_TPOFF32 \ || (type) == R_ARM_TLS_DESC) \ * ELF_RTYPE_CLASS_PLT) \ - | (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY) \ - | (((type) == R_ARM_GLOB_DAT) * ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA)) + | (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY)) #else #define elf_machine_type_class(type) \ ((((type) == R_ARM_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ - | (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY) \ - | (((type) == R_ARM_GLOB_DAT) * ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA)) + | (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY)) #endif /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ diff --git a/sysdeps/arm/dl-sysdep.h b/sysdeps/arm/dl-sysdep.h index ce7a84a7de..3099ee419f 100644 --- a/sysdeps/arm/dl-sysdep.h +++ b/sysdeps/arm/dl-sysdep.h @@ -21,5 +21,3 @@ /* _dl_argv cannot be attribute_relro, because _dl_start_user might write into it after _dl_start returns. */ #define DL_ARGV_NOT_RELRO 1 - -#define DL_EXTERN_PROTECTED_DATA