From patchwork Fri Oct 5 08:47:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristina Martsenko X-Patchwork-Id: 148170 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp180684lji; Fri, 5 Oct 2018 01:50:49 -0700 (PDT) X-Google-Smtp-Source: ACcGV63o9wDdZ13v8H3FGv08B3fLGdTL1Il1XGtonvKlEXBAbXqDlLLisMHII5kIYMzrWl2GOQd8 X-Received: by 2002:a63:3c46:: with SMTP id i6-v6mr9182845pgn.286.1538729449153; Fri, 05 Oct 2018 01:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538729449; cv=none; d=google.com; s=arc-20160816; b=tqt6LuicgFwJwK8MdkdQtZ7MYscr+Qez29RNs/4QkbK/euKvGc4r8086G0hWrhg2cW fwfqis9b6+Sm9kIOy9Ncu/VSjfCUZk68uLkHgAiqFsQSyupEvT2jhtHidQ342U8/W2Q8 O8Vdiz2iIhItrJJhZWiUwSG8BSSU5Z6TYKypvJsyo7cFfCfRQI8/YhSee8on9aUYxHGj zQ5/Bmc6lNHbpTSWuFjNeVDagD/UDblakrfoKxT90W2ZxWE2LSNWhVp94cUglaNS4wpO UXRkc8oKF84qQDrIp3hunxXsSit3Z5A6GbdIHeWXPb1Pki6RI8v/v52MIFE1t5kn7ukI FTbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=4xCflmaAlUPnxxWkkcErOh7EaiZVAXVSRTTeGTPyqyU=; b=KtZOG/BI4LWdU6WQooRWtGeH5QeBbQ2+Zu9J+hVPZxnNrBsHVo56PCnvbm1IwsfAUS Knxp5/WhommQtazAAoHuXy6/3C2+kGxFwpq7xWah0xAWSvrK0Z/RU7RTcIhSgTX1ziyo k6KSGlo5jaBB6Zzc53JKXi7nBdqGWjIY4zuKT9sruyBqoMMvSJrY7dvyZi6UmJ5o2Vph cOOtzbI3kWT7Xea6G/U/5HXIg5ggH1P6HuvSOdLEIVVIW0EF4HeYbi6DFzPU9XEe+7og NH2NhSbB3Gjpp5AAoqvD3RF/4b0rq3NNbZlWd8WFXxBYaviTp0xvDsQeFdglthcapQzD X1vg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i10-v6si6185777pgb.71.2018.10.05.01.50.48; Fri, 05 Oct 2018 01:50:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728958AbeJEPsb (ORCPT + 32 others); Fri, 5 Oct 2018 11:48:31 -0400 Received: from foss.arm.com ([217.140.101.70]:48042 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728012AbeJEPsb (ORCPT ); Fri, 5 Oct 2018 11:48:31 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 881E21650; Fri, 5 Oct 2018 01:50:46 -0700 (PDT) Received: from moonbear.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 52E713F5B3; Fri, 5 Oct 2018 01:50:43 -0700 (PDT) From: Kristina Martsenko To: linux-arm-kernel@lists.infradead.org Cc: Adam Wallis , Amit Kachhap , Andrew Jones , Ard Biesheuvel , Arnd Bergmann , Catalin Marinas , Christoffer Dall , Dave P Martin , Jacob Bramley , Kees Cook , Marc Zyngier , Mark Rutland , Ramana Radhakrishnan , "Suzuki K . Poulose" , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC 14/17] arm64: unwind: strip PAC from kernel addresses Date: Fri, 5 Oct 2018 09:47:51 +0100 Message-Id: <20181005084754.20950-15-kristina.martsenko@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005084754.20950-1-kristina.martsenko@arm.com> References: <20181005084754.20950-1-kristina.martsenko@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland When we enable pointer authentication in the kernel, LR values saved to the stack will have a PAC which we must strip in order to retrieve the real return address. Strip PACs when unwinding the stack in order to account for this. Signed-off-by: Mark Rutland Signed-off-by: Kristina Martsenko --- arch/arm64/include/asm/pointer_auth.h | 10 +++++++--- arch/arm64/kernel/ptrace.c | 2 +- arch/arm64/kernel/stacktrace.c | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/arch/arm64/include/asm/pointer_auth.h b/arch/arm64/include/asm/pointer_auth.h index 5e40533f4ea2..e60f225d9fa2 100644 --- a/arch/arm64/include/asm/pointer_auth.h +++ b/arch/arm64/include/asm/pointer_auth.h @@ -55,12 +55,16 @@ static inline void ptrauth_keys_switch(struct ptrauth_keys *keys) * The EL0 pointer bits used by a pointer authentication code. * This is dependent on TBI0 being enabled, or bits 63:56 would also apply. */ -#define ptrauth_pac_mask() GENMASK(54, VA_BITS) +#define ptrauth_pac_mask_ttbr0() GENMASK(54, VA_BITS) + +#define ptrauth_pac_mask_ttbr1() (GENMASK(63, 56) | GENMASK(54, VA_BITS)) -/* Only valid for EL0 TTBR0 instruction pointers */ static inline unsigned long ptrauth_strip_insn_pac(unsigned long ptr) { - return ptr & ~ptrauth_pac_mask(); + if (ptr & BIT_ULL(55)) + return ptr | ptrauth_pac_mask_ttbr1(); + else + return ptr & ~ptrauth_pac_mask_ttbr0(); } #define ptrauth_task_init_user(tsk) \ diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index cb8246f8c603..bf4d6d384e4f 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -970,7 +970,7 @@ static int pac_mask_get(struct task_struct *target, * depending on TCR_EL1.TBID*, which we may make use of in future, so * we expose separate masks. */ - unsigned long mask = ptrauth_pac_mask(); + unsigned long mask = ptrauth_pac_mask_ttbr0(); struct user_pac_mask uregs = { .data_mask = mask, .insn_mask = mask, diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 4989f7ea1e59..44f6a64a8006 100644 --- a/arch/arm64/kernel/stacktrace.c +++ b/arch/arm64/kernel/stacktrace.c @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -56,6 +57,8 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) frame->fp = READ_ONCE_NOCHECK(*(unsigned long *)(fp)); frame->pc = READ_ONCE_NOCHECK(*(unsigned long *)(fp + 8)); + frame->pc = ptrauth_strip_insn_pac(frame->pc); + #ifdef CONFIG_FUNCTION_GRAPH_TRACER if (tsk->ret_stack && (frame->pc == (unsigned long)return_to_handler)) {