From patchwork Fri Jun 12 13:29:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 39582 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 4F036395B0A8; Fri, 12 Jun 2020 13:30:09 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140080.outbound.protection.outlook.com [40.107.14.80]) by sourceware.org (Postfix) with ESMTPS id E4AB6395B086 for ; Fri, 12 Jun 2020 13:30:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E4AB6395B086 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=OrWIdejFRvcSzaJ59gNmXkyaenI0h4cQ+xf+ZbXTUZQ=; b=PvhTOXy5cjjbP0nOgq1QxJUpEBcV86ciT8lp+s5CICXJw90zwdAXY78qslXJuf6N1AkVRKschQ6L0Ac4ubl5PWbans99pr2C2mbt4Yb5nzEeTURC+24HoQTp1byhhup7G2hRFLuDukaX5qmiBwSHQ5syuYjAsgq7jy5CNe0Krjo= Received: from DB7PR03CA0075.eurprd03.prod.outlook.com (2603:10a6:10:72::16) by DB6PR08MB2631.eurprd08.prod.outlook.com (2603:10a6:6:23::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.19; Fri, 12 Jun 2020 13:30:03 +0000 Received: from DB5EUR03FT033.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:72:cafe::fd) by DB7PR03CA0075.outlook.office365.com (2603:10a6:10:72::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.18 via Frontend Transport; Fri, 12 Jun 2020 13:30:03 +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=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 DB5EUR03FT033.mail.protection.outlook.com (10.152.20.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.18 via Frontend Transport; Fri, 12 Jun 2020 13:30:03 +0000 Received: ("Tessian outbound 8bb15bb571b3:v59"); Fri, 12 Jun 2020 13:30:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4efc88d319e4b9be X-CR-MTA-TID: 64aa7808 Received: from d79903df7049.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 824A3C51-D1D0-4F5D-B4CE-862E9D875ED7.1; Fri, 12 Jun 2020 13:29:58 +0000 Received: from EUR02-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d79903df7049.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Jun 2020 13:29:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AfIASoyJUoyG6928BNV/NQBLOKLgnBanrlwDiafnT4tpOJVDU2txmpfEiKPRw+vje0WExerO0hC9XRbjuh5I090PlDZq9ZgbVqobz+BBsK79cIQZAJ+YjFsqVKPwbaPMtI+AXowei5wp8k5aSfkUpj4yLq5ooFPx/UXko67yawY2RoDhY2eSItz83H0DSYnCBJDw5MjsA2rX14+OCdXXUHeRojncfiaCjCa+jbgI8b06mcNfmJSBSDrjx/f0X2JSLPRBcqF3hg4u7Mja2UD4vSWY2ppze6lJvVncc+kuRqUjL+fYczKMPnGZef/muzY3btPDO7szA6l5etzFjmz7LA== 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=OrWIdejFRvcSzaJ59gNmXkyaenI0h4cQ+xf+ZbXTUZQ=; b=nuIIMj3y+OZvW1oSFF3ySv9MoBkdfNvNHsiG8COAgroyXH9D9D9hAe4zDu/MaY+9w2MBxqQLU4YnFboRK9A3lv3f7TS96oG/z79m3XL7kL+m9HsQlAjLJ6UZMlanv3L/piFxLHzYD+7h6edNkBV0HEzN/J91uKNty4gry62ta5Wzl2YrGSi6aAQHrp4udq0PXMW62AkKsW9sR0gvR/Isv49qhLH0hN8oKzUCu9k6SmQPml3dy6njnNY1PpgVatTMaMNw0esFnuZspdDB4jqUZPDQqr/OUIMXQvPjlksLdpH8zR8ZjBCJb8QZUbE8JtI9wxK6ciKiHVDGX3VE+TFgJg== 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=OrWIdejFRvcSzaJ59gNmXkyaenI0h4cQ+xf+ZbXTUZQ=; b=PvhTOXy5cjjbP0nOgq1QxJUpEBcV86ciT8lp+s5CICXJw90zwdAXY78qslXJuf6N1AkVRKschQ6L0Ac4ubl5PWbans99pr2C2mbt4Yb5nzEeTURC+24HoQTp1byhhup7G2hRFLuDukaX5qmiBwSHQ5syuYjAsgq7jy5CNe0Krjo= 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 AM6PR08MB3912.eurprd08.prod.outlook.com (2603:10a6:20b:86::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.24; Fri, 12 Jun 2020 13:29:57 +0000 Received: from AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::2404:de9f:78c0:313c]) by AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::2404:de9f:78c0:313c%6]) with mapi id 15.20.3088.022; Fri, 12 Jun 2020 13:29:56 +0000 From: Szabolcs Nagy To: libc-alpha@sourceware.org Subject: [PATCH v4 11/12] aarch64: redefine RETURN_ADDRESS to strip PAC Date: Fri, 12 Jun 2020 14:29:29 +0100 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SA9PR03CA0017.namprd03.prod.outlook.com (2603:10b6:806:20::22) 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.53) by SA9PR03CA0017.namprd03.prod.outlook.com (2603:10b6:806:20::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.20 via Frontend Transport; Fri, 12 Jun 2020 13:29:55 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.53] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 528520c6-b294-4b93-362b-08d80ed4b6f0 X-MS-TrafficTypeDiagnostic: AM6PR08MB3912:|DB6PR08MB2631: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7219;OLM:7219; X-Forefront-PRVS: 0432A04947 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: SApsYv7QZm5Xm9Cro+5iJJy+V87RVDW1BgGA9wMv/kxm7orfsRS2/hjtNNyVaPzqKoIrE3+8lSJEnnyrIV6VUgoOQzFGU26JrsRQA34H/kgkgUa3pSdYPFpMSU0L/Gk4tpaJBXWrJcVM4d4mucZdKHPt+DQpCPC897YZeZsdWWY11koXhgjdwFz4ns+E9kpu35vB0vskadbIDhhdzbEY5uS32STdoGrRl9XybyWVGk19DQRJhejxNw+O57WOnnnf4ofr2BG8nfNca4bw8npixO1l58lVRUYYHMIZKS1u1ZxaoP28NizEO+S48gXZ05mw4efo231u5Q535QufN1w3yWOSUjipzwj8zf369SI0abYhU6ZG87HffK94THmaNS5QjT0c7OvzoU2/tOC1i4zY/WTbldZ7qCcqIDgPU7fZ2Tg= 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)(136003)(376002)(346002)(396003)(39860400002)(366004)(956004)(66476007)(66556008)(66946007)(6506007)(26005)(6512007)(5660300002)(6916009)(6666004)(2906002)(8676002)(6486002)(52116002)(8936002)(44832011)(186003)(16526019)(36756003)(2616005)(316002)(86362001)(83380400001)(69590400007)(478600001)(136400200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: KSkvx6VvuYqr+Y49/g4+xU2dK2uVR4z9mJzpFZX4calnWSFKl6ts66VzsRFUBN+j8QSoFFKN2xVRahde/qAOUzgKs0NbsWpMviJota0+eDaNOi3viB5nlDUcYkE6W6dxoIH02gcFWfx9nVOm15AFOt2zYUp2OUDuKnCuHomooJOPfZjrJ+TJou+YHf/w0CjaXIuYRSQepo8dhTL3OT3sLH9BI5WPqtZ8O4vvccr/K0FtUNPAA5moYe5+dkeOZDnVXYZRRntilCFUaJvc8GaIF8KqkimR0RZKwU4qgz6figFaY1SrXMaK/nJS6bpeox5aLHzLbqgrhx301KegY13bBoYKfiNk0iKIAnTbbdwC0OvLVwvke96o3dTeEAOOFrKvPNdeeDdwcXkPIGUVGo6p/ExmcLQnoQEsZe7hQ9UvO52dHCAGf6yrO2GRUpihw6ikeSkEaUaBzg9lxzJLePEvLfXCxO2int91rqgVaUMJzqo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3912 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: DB5EUR03FT033.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)(39860400002)(376002)(346002)(396003)(136003)(46966005)(478600001)(186003)(81166007)(83380400001)(16526019)(82310400002)(6506007)(26005)(356005)(47076004)(69590400007)(6666004)(336012)(82740400003)(956004)(316002)(2616005)(44832011)(5660300002)(70586007)(70206006)(8676002)(6486002)(8936002)(2906002)(6916009)(6512007)(86362001)(36756003)(136400200001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 232e7af8-5a2b-4777-54f5-08d80ed4b27c X-Forefront-PRVS: 0432A04947 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ew6f5Ci3gbTBNNKo5YPfKBTZN66PxpeXF7LOdfqkxBqX/1lMPrEtVHXxNJhlSZWUe1Bvs1thZQgZo0qCEN8p2qB1Q54RBt5Ra59z6KuF70Mu65viTFxnMk+QRtnKoj+XV8mcFfs3qlKfr/YShzOx/bOOMVibLIY5LTCgQsEeD7nf191AYYqa/zoDZAPGheP79fVhUIE6oMPabPo5O216pWa07yHnB/nQd8Ne04GvdyR/3EGoA9OYsLAvRCVl670uhHEuQ3sl22FmPLlPN+ROesqEaDrH12Xrrln01VPc2xMO0rFAjKWRv0R8XRl4pVKqfhl722vnHAM5Saic0U5OL7CQ1YY0jXeKqbo9gSzrUlw7HBuRYOg+yHbU9Ty4WosQMZwxdRFA+j1SscN3SfAlr6fm5k4Nkeo9dtfaP2M1w6ixspP/r88QPblUhva+n8cGRUnKBcH/8YYv93ub26y92Q== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2020 13:30:03.7916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 528520c6-b294-4b93-362b-08d80ed4b6f0 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: DB6PR08MB2631 X-Spam-Status: No, score=-17.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, 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 may contain a pointer authentication code (PAC), so its definition is adjusted. This is gcc PR target/95891: __builtin_return_address should not expose signed pointers to user code where it can cause ABI issues. In glibc RETURN_ADDRESS is only changed if it is built with pac-ret. There is no detection for the specific gcc issue because it is hard to test and the additional xpac does not cause problems. --- sysdeps/aarch64/sysdep.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h index 2879aeaa5c..593bdd35a2 100644 --- a/sysdeps/aarch64/sysdep.h +++ b/sysdeps/aarch64/sysdep.h @@ -44,6 +44,13 @@ strip_pac (void *p) asm ("hint 7 // xpaclri" : "+r"(ra)); return ra; } + +/* This is needed when glibc is built with -mbranch-protection=pac-ret + with a gcc that is affected by PR target/95891. */ +# if HAVE_AARCH64_PAC_RET +# undef RETURN_ADDRESS +# define RETURN_ADDRESS(n) strip_pac (__builtin_return_address (n)) +# endif #endif #ifdef __ASSEMBLER__