From patchwork Mon May 13 14:50:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 32659 Received: (qmail 26971 invoked by alias); 13 May 2019 14:50:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 26963 invoked by uid 89); 13 May 2019 14:50:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, MIME_BASE64_BLANKS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: EUR04-HE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr70071.outbound.protection.outlook.com (HELO EUR04-HE1-obe.outbound.protection.outlook.com) (40.107.7.71) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 May 2019 14:50:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a6pFOBzBIpN4085i8c/wxMy3htkv1oTPu2uJCAXu2jA=; b=Lns9e/bDEXRzwouuWmA/Oz3u8t3F1kWdvCTwULr94iwqGq82TS/oBbzOZmslvCzcEHGlOvvR9bjUzV0kajVabDUIIZgG58m0RbTdMtboZ9q7mgvPz6SO0cbIMzSKx3+l98ihJYkLL6nwos3cMDZaCi1nE/nNbY6yNRFUN6ngPFw= Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com (10.172.227.22) by DB6PR0802MB2247.eurprd08.prod.outlook.com (10.172.226.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1878.22; Mon, 13 May 2019 14:50:26 +0000 Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::8c26:bb4b:6c93:9d40]) by DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::8c26:bb4b:6c93:9d40%2]) with mapi id 15.20.1878.024; Mon, 13 May 2019 14:50:26 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd , Alan Hayward Subject: [PATCH] AArch64: Treat pauth ops as nops on non-pauth systems Date: Mon, 13 May 2019 14:50:25 +0000 Message-ID: <20190513145017.59728-1-alan.hayward@arm.com> authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-ms-exchange-purlcount: 1 x-ms-oob-tlc-oobclassifiers: OLM:9508; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-IsSubscribed: yes Running an address signed binary through GDB on a non pauth system gives the following error: Call Frame Instruction op 45 in vendor extension space is not handled on this architecture. Instead GDB should ignore the op, treating it as a nop. Add test case for pauth binaries, regardless of whether the target supports it. gdb/ChangeLog: 2019-05-13 Alan Hayward * aarch64-tdep.c (aarch64_execute_dwarf_cfa_vendor_op): Treat DW_CFA_AARCH64_negate_ra_state as nop on non pauth targets. gdb/testsuite/ChangeLog: 2019-05-13 Alan Hayward * gdb.arch/aarch64-pauth.c: New test. * gdb.arch/aarch64-pauth.exp: New file. --- gdb/aarch64-tdep.c | 6 +++- gdb/testsuite/gdb.arch/aarch64-pauth.c | 36 ++++++++++++++++++++ gdb/testsuite/gdb.arch/aarch64-pauth.exp | 43 ++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.arch/aarch64-pauth.c create mode 100644 gdb/testsuite/gdb.arch/aarch64-pauth.exp \ No newline at end of file -- 2.20.1 (Apple Git-117) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index cb185ee337..7368026a7f 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -1180,8 +1180,12 @@ aarch64_execute_dwarf_cfa_vendor_op (struct gdbarch *gdbarch, gdb_byte op, struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct dwarf2_frame_state_reg *ra_state; - if (tdep->has_pauth () && op == DW_CFA_AARCH64_negate_ra_state) + if (op == DW_CFA_AARCH64_negate_ra_state) { + /* On systems without pauth, treat as a nop. */ + if (!tdep->has_pauth ()) + return true; + /* Allocate RA_STATE column if it's not allocated yet. */ fs->regs.alloc_regs (AARCH64_DWARF_PAUTH_RA_STATE + 1); diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.c b/gdb/testsuite/gdb.arch/aarch64-pauth.c new file mode 100644 index 0000000000..af9bbe4a93 --- /dev/null +++ b/gdb/testsuite/gdb.arch/aarch64-pauth.c @@ -0,0 +1,36 @@ +/* This test program is part of GDB, the GNU debugger. + + Copyright 2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int +bar (int b) +{ + int x = 1; /* break here. */ + return b - x; +} + +int +foo (int a) +{ + int y = bar (9); + return a + y; +} + +int +main () +{ + foo (5); +} diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp new file mode 100644 index 0000000000..aa4060e88c --- /dev/null +++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp @@ -0,0 +1,43 @@ +# Copyright (C) 2019 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test a binary with address signing works regardless of whether the target +# supports pauth instructions. On non pauth systems, all pauth instructions +# are treated as nops. + +if {![is_aarch64_target]} { + verbose "Skipping ${gdb_test_file_name}." + return +} + +# Build program with address signing forced on. +standard_testfile +set compile_flags {debug} +lappend compile_flags "additional_flags=-msign-return-address=all" +lappend compile_flags "additional_flags=-fno-inline" +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_flags}] } { + return -1 +} + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +gdb_breakpoint [ gdb_get_line_number "break here" ] +gdb_continue_to_breakpoint "break here" ".*break here.*" + +# Ensure we can get a full backtrace, despite the address signing. +gdb_test "bt" "^bt\r\n#0 +bar *\\(b=9\\) +at.*\r\n#1 +0x\[0-9a-f\]* +in +foo \\(a=5\\).*\r\n#2 +0x\[0-9a-f\]* +in +main \\(\\).*" "backtrace"