From patchwork Mon Jan 18 16:24:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 41749 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 29B833834404; Mon, 18 Jan 2021 16:25:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29B833834404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1610987107; bh=AdyoSE5CMXjAE5vYaJDFruUjYXDyPfVi1c2wMX3xpIQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UhpJQaUhKFVeL+/bGTpEu+yts2KhZyKpEt9IuvdN0Q5vQjwPVSOQvjaWnmlRiQJ4W yH+YZKIlrEXrZ+m6Ix9fIQLCIqKwlsE/OAJ78/e6xv63raMg+3DPMVKweuy4zBMIfc 0TYgXCgfaSnrYp98k+9czrnvBYn6NHlatIAsrZmA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04hn0249.outbound.protection.outlook.com [52.100.17.249]) by sourceware.org (Postfix) with ESMTPS id BF5BB3834404 for ; Mon, 18 Jan 2021 16:25:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BF5BB3834404 Received: from AM0PR08CA0022.eurprd08.prod.outlook.com (2603:10a6:208:d2::35) by AM0PR08MB3172.eurprd08.prod.outlook.com (2603:10a6:208:66::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.9; Mon, 18 Jan 2021 16:25:02 +0000 Received: from AM5EUR03FT057.eop-EUR03.prod.protection.outlook.com (2603:10a6:208:d2:cafe::c0) by AM0PR08CA0022.outlook.office365.com (2603:10a6:208:d2::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.9 via Frontend Transport; Mon, 18 Jan 2021 16:25:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT057.mail.protection.outlook.com (10.152.17.44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.12 via Frontend Transport; Mon, 18 Jan 2021 16:25:01 +0000 Received: ("Tessian outbound 2b57fdd78668:v71"); Mon, 18 Jan 2021 16:25:01 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8eb0bb8a311de959 X-CR-MTA-TID: 64aa7808 Received: from 2f20a7066578.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F1D249C8-9798-491C-8E4F-C1BE7811420C.1; Mon, 18 Jan 2021 16:24:56 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2f20a7066578.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Jan 2021 16:24:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=la6bta/wJPA4wYhzS0cvu1GsgwyxYGL54gUXXzYBXEDDoPvmKXQZZ+8qQ0ZQDs67L4de0PwfOAJk1qy1DH9JthEBKnlyaOeosmg0CXV7RTZt+HXO4s++wrss1bjXyChtPfHglw8rfdQS2E/2XH5o60vM8ccOXraRDYWBJAZznSAlA8PbDlC+coHHEir39NW47VaXgHCTPXfzHaZSI0qvAzwJnms9XntiYnd9I4LEFDivEn73JlRmH1xaoGeSywMI6Lb8NvbLLG+bbF2c0HFm9OPiYBdS6b5RfzlTadaJiC7NcWD7wnI5TbqMi2dJzNYvSaUBADpulvPODRADLMu3+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AdyoSE5CMXjAE5vYaJDFruUjYXDyPfVi1c2wMX3xpIQ=; b=mNC5CV3f2RO+K6IHg6Jrkxf1pi1MW4Jczt/E3KYO8+GopeUP4vxbusogd2t57wI2B/VjuUNEJKFjaEMZmV93IH7PR27jdzxojJBMPUEK6UhIhxJzDtAEofMt9gzHG7V2Lq3oD4+rG5HSaTK5qVuf/SxvpKvQ7ATjP5EaSWspeHtrPHZ24vujipP8mKR5ySiSVIqpm6pp/Ma/eDz/Q+DKRLv9kw00Cy29L48s9sLswd0n2/is5efo/+xTn/c453Wb6iEouVojjyVHUZUL4MH8N4kb3nWrKv3ZhyiuErpf4YNQWVqenYVhp/lT3hPmEdbnxj6k2M1ooGjlMcRCc2kOfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PA4PR08MB6238.eurprd08.prod.outlook.com (2603:10a6:102:e8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.11; Mon, 18 Jan 2021 16:24:55 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::700f:ddbe:a347:ee4f]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::700f:ddbe:a347:ee4f%7]) with mapi id 15.20.3763.014; Mon, 18 Jan 2021 16:24:55 +0000 To: libc-alpha@sourceware.org Subject: [PATCH v4 06/10] elf: Avoid RELATIVE relocation for _dl_sysinfo Date: Mon, 18 Jan 2021 16:24:48 +0000 Message-Id: <3ed8c627e3f1353e5539b458e596c4112121b3ba.1610986541.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.54] X-ClientProxiedBy: LNXP265CA0065.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::29) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.54) by LNXP265CA0065.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10 via Frontend Transport; Mon, 18 Jan 2021 16:24:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8ac28741-209a-4fe6-a643-08d8bbcd9b3a X-MS-TrafficTypeDiagnostic: PA4PR08MB6238:|AM0PR08MB3172: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8273;OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: rNTBTMoHI7o2QXhXbnVqm5Aihz8/IrMmVDIqlN9CwMX6BTZmzXCWkILHQSGnkhm8FwZqLr7X9myUbobKwIcAUoLaCwVH6vCYPFeyDoMLSxjU767tbNOcMYLfFYkVulIAFKP2Wt02NmmtDTZyItNPLTEmlQrCHCUfkJ6IskoK0OFGamhwFYeq9TIw8H2tFo5gLGfwHb0V9P/APy/SEYIgoqaSBXCtiJpmHYmPctz4kfM7oiJHwLiXJ1ebk0LPI+TnKCuOt/auEXnZ7z4EMdRT0cd390NCi9cz3v5L0O5W7qGegi1GoqmUZ982Hp4bWX6ZX/6bSHgQVj4gT5V8d3jYo7P07hWMatkrHm6ZmJY/TBu+kMBNSQrD80W0+wqHNc8/9fooPhePeunpeJl24zzVHutfKEPYpRhKA9tiJbc/T6bwGt2EUOcERdlIt36wlYw30B0YC5dlUCc6WH8Kv08vvVcZ4x+sU/MqAKiJD5wjvDLRfDMz8CkkMFmhebF+yZjhcSZM+3HAmSDLee7J8NbnWg7KeNhJ511CmqUME1LHggLOmzdIJYRPXL8VWs+E7NXzJYajmDeaPgEWR+GvC1afrw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(39850400004)(376002)(396003)(136003)(346002)(83380400001)(6486002)(8676002)(4326008)(69590400011)(478600001)(6666004)(52116002)(6916009)(316002)(8936002)(66476007)(66556008)(66946007)(5660300002)(86362001)(16526019)(26005)(6512007)(2906002)(186003)(6506007)(956004)(2616005)(36756003)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Udas7VN5mleXDHttjJJGQk0J/SKEtfOvy6uMaNaOKMbSKc/1YCXWwZmTCb/Ptttpuwt1/XNArR8MkWqXV4d4IL7i3gTcc5chkAcgogXs08g50N1JDEnmPdAG6Vzw6lSpLqBt6U5DK/kZj6H+ZXNdZd8ehVQKra3f1zozDfj6bBqQY/kQK03EzkijKArWaK6Op02ZiUIE/VlLeSmBpsw1hDxDQmTiiPoY0j5+vQgC7Qf7d0zQKk9mPQ6iAPRqeF9k/uKtdHk2sstIo/D/hHKt9smsiqzlpidaRLFT5oqidxx2c5jp8hs9yYkBsmnN+TjFhUd6g4cKWkwnwyqjJwrPcpZvgRLGAhzc/fbitGPxVnyK4imm+9LLKqorSYCyH3F70m0O35ZmNvsGIS8u6r8MAwODaL+ZvPw0saJ2a4QeLle+ZCLMxm+UppkPclqEU1TupKcv0GhmW5VlQM5WwPQpNtEtj8kjBDFsvUzGXuD0NF95HxeaitTSRW0pXbUtLtx5Z/xxVuR6+1i4Jo0KyppDzJScXF6FetQrxMM4UUILTVXnpekmo3GyecRIgdlbDGZ27/trvki6B9DNsP2RQDvcwIHQxPCXOMteAzUEVmZ3LIk2dxg24cDoE4hhj03u/kj8HYNldLw8lQ+kYVNnGvBXDirk2zurQ7/ViwRyGjM2aDtA0PaDYtbJEYryJGQS15+426fOWHkjxjjwcWEp7TIhPb13rWjzwEe46f+tdgGw0zfXdddq1WtIrd0XWfxjt26COnpG1emf0+u/GcG/qKW3IyZkPyzq7GsqAz74MoCIPKnszcHwGpRde4A6Hwv/lSN09Dvq4X6FssSvYi6SiBtJ6/G6mN1tVF/ZnQqKg0ffyiPiB32cV/ndW+rw9U0EkAcMDOmpBkW/lKaaU0qzBNl/tvXMJe2TfMFl3IDh6OsI7ZTTHpNIE8k+0nfw+smdOJGBNKmCdgckZbYwe4FtrQMmZyD/igtqM7v1k+wFRs+oQj2wQsQIrVw5XbNYWDdHvjzQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6238 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT057.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 46ba3502-f89f-4952-3efa-08d8bbcd96e1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: We8rzdducK0HfpMJSGShJidcjoibwrlGT92PXWUeoZnJyVokyJVjs9NYBnriKJRxa/dPFIxywxyO/aChEwk4W7CKk6MCtPkUieYNcXy6d54uVKA+9lntUrfWUX/Eaps+RN6TC8EcmwZcXbESBPLlHHEbnuxCa8BfYPXcJoXLk4kRg9B4ucuKlWDdiQ30ztiW5mPbQ3T/2UWG3O1nI9/sDRWTsTx/2riB/QW2oq3DFNKvreSSj/KL9RunVS8uVGLB0KL0PGDxwUxzEs5nepb0Iu1TqDuMUJ843DF3vjoC1bcFR4L8Wy8gF4++jCRK9mK7MFcqnylDaSsjPhkzlLHzH+2oLA8hQwBvCUVAGxwCa5dljt/2/VDDh5zuYUuHSHmtSfbUj7rS18EDislFDCgVYHfGLhmGu86ZF2POqtu7kKhHLWM+VZIhOTsU7vcB+tmCSE/PTnQzmvzx0paU1HHDGkB9Zs76GFjHB0qszdCjJt3LmZiudLciODAA0UanfKPh X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(136003)(376002)(39860400002)(396003)(346002)(46966006)(6512007)(81166007)(6486002)(107886003)(2906002)(47076005)(356005)(4326008)(70586007)(82740400003)(26005)(83380400001)(6916009)(5660300002)(8676002)(86362001)(70206006)(6666004)(316002)(16526019)(2616005)(44832011)(82310400003)(956004)(186003)(34010700045)(336012)(69590400011)(478600001)(8936002)(36756003)(6506007); DIR:OUT; SFP:1501; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2021 16:25:01.9367 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ac28741-209a-4fe6-a643-08d8bbcd9b3a X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT057.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3172 X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: "H.J. Lu" In static PIE, set the default _dl_sysinfo in _dl_aux_init, instead of using the RELATIVE relocation to intialize it. This is needed for fixing bug 27072 on x86. --- elf/dl-support.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/elf/dl-support.c b/elf/dl-support.c index 384080dd80..5acd59290f 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -200,7 +200,12 @@ struct dl_scope_free_list *_dl_scope_free_list; #ifdef NEED_DL_SYSINFO /* Needed for improved syscall handling on at least x86/Linux. */ -uintptr_t _dl_sysinfo = DL_SYSINFO_DEFAULT; +uintptr_t _dl_sysinfo +/* NB: Avoid RELATIVE relocation in static PIE. */ +# ifndef BUILD_PIE_DEFAULT + = DL_SYSINFO_DEFAULT +# endif +; #endif #ifdef NEED_DL_SYSINFO_DSO /* Address of the ELF headers in the vsyscall page. */ @@ -238,6 +243,11 @@ _dl_aux_init (ElfW(auxv_t) *av) uid_t uid = 0; gid_t gid = 0; +#if defined NEED_DL_SYSINFO && BUILD_PIE_DEFAULT + /* NB: Avoid RELATIVE relocation in static PIE. */ + GL(dl_sysinfo) = DL_SYSINFO_DEFAULT; +#endif + _dl_auxv = av; for (; av->a_type != AT_NULL; ++av) switch (av->a_type)