From patchwork Tue May 12 10:14:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 1288355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=wRwftdsz; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=wRwftdsz; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49LtxG5ZXCz9sRf for ; Tue, 12 May 2020 20:16:02 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C2CA39574C0; Tue, 12 May 2020 10:15:15 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30087.outbound.protection.outlook.com [40.107.3.87]) by sourceware.org (Postfix) with ESMTPS id F3731393C8AC for ; Tue, 12 May 2020 10:15:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F3731393C8AC Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Szabolcs.Nagy@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w1RScHoubRk/4PQwP/u/2g90gK+K8wI+YhIhkrhXJCw=; b=wRwftdszfm2Bpr473uVzSUUZqbKeCe2vOQn8cauQwdyeQBHCvFltffAR7e0Q++n8y4OchDKNMPaf9pPyuiZGRL+TdhAi/SIyFDYvzHA60YPnQ+1FKa2IXAVrQCq3cQYd79JqSW5u0EzEDdoi4aijGSeaZ/iPOSB1B/8bLllm5yA= Received: from DB6PR07CA0160.eurprd07.prod.outlook.com (2603:10a6:6:43::14) by DB8PR08MB3962.eurprd08.prod.outlook.com (2603:10a6:10:a9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.34; Tue, 12 May 2020 10:15:10 +0000 Received: from DB5EUR03FT060.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:43:cafe::b) by DB6PR07CA0160.outlook.office365.com (2603:10a6:6:43::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.11 via Frontend Transport; Tue, 12 May 2020 10:15:10 +0000 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=bestguesspass 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 DB5EUR03FT060.mail.protection.outlook.com (10.152.21.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27 via Frontend Transport; Tue, 12 May 2020 10:15:09 +0000 Received: ("Tessian outbound 567b75aed2b9:v54"); Tue, 12 May 2020 10:15:09 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: fb7ed153c1e5a674 X-CR-MTA-TID: 64aa7808 Received: from 6886d957944c.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E2C66B23-E9A4-4201-8B4F-88F18E9C1208.1; Tue, 12 May 2020 10:15:04 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 6886d957944c.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 12 May 2020 10:15:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CZN678JAaEomnTNde6gFkrEQnft4D4e1uobRDS7Rpf8vgwCocj8vxffM7qVHXncJzjqunOx3agGwWuKilFPgt4M1oEwr1BXuu0FzFZYP1O3gvVuEU+oaGyNTedvOfyCuvAEaleLDQEGWXL0EHijUtZfDjhUMoqAQ/pJ3hvaXtaysXH6S6p+OfoG7cxEMg7gmsxe1qPAg+7K7l8D38cDSkjmkXv5ipwmf132N65wLhTHkbXfhaps9UpZRaVcbEOGMCoiHX5Var02txNOUAirUNje0X0oY0/fv5sLDF2IoBzjujvKdaOgc2JLRoYkBXrn85+jPTp3cRf60iyFgYyBN1g== 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=w1RScHoubRk/4PQwP/u/2g90gK+K8wI+YhIhkrhXJCw=; b=iIBnwibWRH7eC+Lq3GqrofF//YEfDMXj1gh5IeqVfq1P9V+Jn6Qpyio5QAiAGpyIFl+ZgpLQbVz1Wa9rEZd4qDidRUdIk1H+q1JFfrjrjtyG54V+QJLJ20h3PxrgBNUkWfFuOg0Pn/Pyo70mjQ9hqEHK8AhTc+0pVPUzLmBvYBh/5Ie078bzvGlLfLOgNUmFnhv4z12hxQp4tOfhJ3BkPrKGXOyl0CHD+zJr6viYS4dos25TWSW/YFWssOQCaXt3tQ1Q7RoHY9vEn5k7L0Lh+D45KMb7C80e+saijonUQbHgaWlourgOCoqIpzHyiNPejP/6ZHBx4e+Gmkle3us0Cg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w1RScHoubRk/4PQwP/u/2g90gK+K8wI+YhIhkrhXJCw=; b=wRwftdszfm2Bpr473uVzSUUZqbKeCe2vOQn8cauQwdyeQBHCvFltffAR7e0Q++n8y4OchDKNMPaf9pPyuiZGRL+TdhAi/SIyFDYvzHA60YPnQ+1FKa2IXAVrQCq3cQYd79JqSW5u0EzEDdoi4aijGSeaZ/iPOSB1B/8bLllm5yA= 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 AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) by AM6PR08MB2982.eurprd08.prod.outlook.com (2603:10a6:209:43::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28; Tue, 12 May 2020 10:15:03 +0000 Received: from AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::49fd:6ded:4da7:8862]) by AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::49fd:6ded:4da7:8862%7]) with mapi id 15.20.2979.033; Tue, 12 May 2020 10:15:03 +0000 From: Szabolcs Nagy To: libc-alpha@sourceware.org Subject: [PATCH v2 13/13] aarch64: redefine RETURN_ADDRESS to strip PAC Date: Tue, 12 May 2020 11:14:49 +0100 Message-Id: <87577148c5eef249758478888556a3aeeb505d97.1589277641.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: CWLP123CA0056.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:59::20) To AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.55) by CWLP123CA0056.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:59::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27 via Frontend Transport; Tue, 12 May 2020 10:15:01 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.55] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 814b689c-0512-4fc8-b51a-08d7f65d5a0f X-MS-TrafficTypeDiagnostic: AM6PR08MB2982:|DB8PR08MB3962: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:10000;OLM:10000; X-Forefront-PRVS: 0401647B7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 1TrcLOUipfI1nrLagBq+rh0yRe7FVaV/RB0ez5IdndGM0CJ7JdXb5qslTVC3d8c0gRdGZSueUG6Y066UxexSjhB3gX5unq8H8EDNcIfN3/cwxZaQxpRZMQ2ZVJtrNqloMLkjgnPcjbvkuOX/VCvg2QqhbY7YkUMvO4wWTsDMdOq7IbuNDgzfiutAiybbJu2sKXrK0bEEMYjwBdFCeU5bxtgX65jyoFov+HUl5J+VnMlpHYTVsrBHjeJdUMKqZiZYDAXUFaIsgOzbvMLZXFqRFLiXTU3QvXtNZNqk64ppGhCYNf7fG6CkBSTuqeE/Cck8xRi5RLtO7l/qoYxibP/jQmyUQtoPKKWSs3vQ0DHV4gNypt/Ee0OCLZiNVslm9xwFhzhVnTY7GMXOx3qNfjl1Z4fgG8WNPwjA9ctEIRqxdkX6pUUaqfbQSuFIzNK+o0mO2ctPlNxL16x84IqHKRArpHocDR87MhqFFWA2puReB8SF9zdcmCOGydFBINbpy+kiZ2TMo0V9cahT9KOU3Y/H6Oyaw1AT+O6AbOY1x8ih2aWWjcQOSAGRPHcfIo7weSAdePp453r7L+ZkfYO2juhKFYaQnI3LRLTNuQ9Q3uhCTjUuoJVwF3COpWDYttQ7K0m1mquNodGUmY1J/RC3OYtmbBGRNE0eLF/jfy06aSJFcYH4piUnw73lCH+NxoSYQHwy X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3047.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(33430700001)(6916009)(16526019)(66556008)(66476007)(36756003)(44832011)(5660300002)(52116002)(86362001)(956004)(8676002)(66946007)(69590400007)(2906002)(6486002)(186003)(316002)(2616005)(33440700001)(6666004)(966005)(478600001)(6506007)(6512007)(8936002)(26005)(136400200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: q967AoqriaKOlD+qj3qXjJMd5k+fR+dk5Q+9D4da83O7l98vyHyabL83t7UHSMRlUv0H++HFILEORL3voM6XJFn8w92+ingIqawWo9HP+gsuEg8BONXTQyITZZ4UsH5L+67lcYwwIeU1XAdEkLE+IAm+74R1yCdOVi3Ow7MEg0opu1552JnITFkMa3S/g0rHz7X9vUULKB3BqyA9qYLiOY39RWWQTRAZ9R195sQ67Q0d3IQ2b2YGrOsHYC07QGlCrc/Uf1C05OxlzdY9/zWkLyEfc61SmJd3DWkpMKAi2Zlgj0YHQ90Zse/HyYsH1J07EKDFLoabEGO+y7JRyyL03JZKK4mP5qMobXAHDEp+hjfYMMFbauWGyfzneZ/cKbvrJEe6UjSUwkVbOJY8uioHFjW6Gmt+17UEOyGqZiIRCCm2aJ1BatSTGzBq5nPOqsDj2iVOeiu1cjY3t6plg84DCRMr7tmx8Pj1wQ7F5nnznIo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2982 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: DB5EUR03FT060.eop-EUR03.prod.protection.outlook.com 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; SFTY:; SFS:(4636009)(136003)(396003)(346002)(39860400002)(376002)(46966005)(33430700001)(16526019)(8676002)(70206006)(6916009)(336012)(86362001)(356005)(82310400002)(26005)(36756003)(47076004)(70586007)(956004)(966005)(5660300002)(69590400007)(2616005)(82740400003)(6666004)(44832011)(8936002)(186003)(6506007)(81166007)(316002)(33440700001)(478600001)(2906002)(6486002)(6512007)(136400200001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 982c7731-5a33-4ab4-a556-08d7f65d54eb X-Forefront-PRVS: 0401647B7F X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: On9l12Q6EZrHT6UevjWiZjf9/kw/33Bdf7nB08fDIwGz0tXShaN5hpB7rhvEUQZ16EiI8NzQ3H3yYWYDcuNbaAgYg4V2Szrgdc7a9iAutkPTtAv/13GqsRchYmSMNF5rqM7RgOc3SswIvKZrIVIpqD+mGQjIcL1B7y2OSjNRGxQ96hYBeC4v2taAigYA5hzEAtdW5YrtNHqLUeBoZEW1p0XsWwMsecWzw7FWo4W09kAolytHmiw9yAwTxBzdpuQbjMEguf95Ld5q2AsJeP9Iptjg53wFuOYF8BDEh2Ld9aKrR6MW3RxLkYPsWtC+o5zKVd8kOoS9WejvWMLjJoOz2DM9ehfSyxYyEBMX5fxCtTCSPNXPjC83PS5ey3EP12L2FTp/S9CTAb1PvO/b8kAwEKRZsFHbuU8CytJzSJo7Y9s23saypjhIt2Ox+y8QZ8yWRqkihPpALA6uLLNLFdSoGxUarBT/BoLVYd3+ROGVAWsQFlveLEnzynb5mMSs3Gwaxv58+yvkgfJtI+wYMco1/AzMlIx1b6rBR8XLbxp5TCzr+Scal3qi4p7RwhmVllU9V7H+3imwBWf6opgyabhTYkMNcZGOQk1nvqDRrzMc6TR9l3kffQ/3J5diQwOBwQZhc1cC5CcrQ79LodOTOvZvB1i4uvKOK/EFLuIJbLriy9tt/U4ZG9YiXK21s7ezW8ATF4JAPuCrlScAzJEqMw1bVjbsBCzc3k0VgDA53DmbPmE= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2020 10:15:09.9509 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 814b689c-0512-4fc8-b51a-08d7f65d5a0f 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3962 X-Spam-Status: No, score=-19.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, 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: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" RETURN_ADDRESS is used at several places in glibc to mean a valid code address of the call site, but with pac-ret it has a pointer authentication code (PAC), so its definition is adjusted. strip_pac is omitted if glibc is bulit without pac-ret, but it could be added unconditionally (that's just unnecessary operations). Inline asm is used instead of __builtin_aarch64_xpaclri since that is an undocumented builtin and not available in all supported gccs. Note: such change indicates a problem in the pac-ret design: it can break code that uses __builtin_return_address and the breakage is only visible at runtime on a system with pac-ret enabled. It is not ideal that users need target specific inline asm to fix this up. For now we can recommend disabling pac-ret where this is a problem, but gcc might need improvements in this are to make pac-ret usable. TODO: __builtin_return_address handling with pac-ret: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94891 --- sysdeps/aarch64/sysdep.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h index d8a5445b7e..2c12aa902f 100644 --- a/sysdeps/aarch64/sysdep.h +++ b/sysdeps/aarch64/sysdep.h @@ -35,6 +35,23 @@ #define PTR_SIZE (1<