From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1DF7C5DF63 for ; Wed, 6 Nov 2019 20:39:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78EC021D7F for ; Wed, 6 Nov 2019 20:39:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CrBxheWL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732556AbfKFUj3 (ORCPT ); Wed, 6 Nov 2019 15:39:29 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:33633 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727351AbfKFUj2 (ORCPT ); Wed, 6 Nov 2019 15:39:28 -0500 Received: by mail-pg1-f195.google.com with SMTP id h27so991725pgn.0 for ; Wed, 06 Nov 2019 12:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Bp86L5fucSA+9Bwlt84/eQbHaJRbEE/iIVDIU2TrYmM=; b=CrBxheWL+VkOfPX3aTBccoLvNQF92thO3oi5LNHeY04/wZsBJ5+Awp3yG38gVaW419 EwFnyiPDR1gnnZmr8ul0W/yKVfgIK5xZNdfgklRC9owvzvrb5YtTfIJlYj3tqqOBxrYA puDhDKyZABgAkq3XZb5IJ/rCNzuAn76ZWc52ybg9wLNMg+z+ZgcGsKJOYHhRkT6tP0wM ec8iwNatVcZ1mqzjbPOeUiHln+ne0fBBsTlHbQGoAkvksK/Txg3rLgikXk+7vSpyZ9Zz Pee10GCisuUq4SYMJ+mByVVfZzuStCOWn9eeJ1oEBMVnENoJixSlbPeRYZP5cyGdf0TZ UunA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Bp86L5fucSA+9Bwlt84/eQbHaJRbEE/iIVDIU2TrYmM=; b=RjDy/IqN7FwcMpeyxrwUV1BbnX2iMgbcZP/L4Fa2BAEIYx43g15adVO7RvPu5UkKoc uaL2zDkMyPfmi94FTT8NSkovxCTj02gqy/ytUU82jXRTY9haIkCx1Pr1YU9EUOuRC6Gw iXtrvQ2CvKBmHkr9T0PD3o98OE3ycmdSSwqLB4kW6ZcqTIm+0GhrTNVXh7pHL4MRevBy p0BmwwTsfJPKpFmdjCc7R0nyevgVxjHLcEoZ1xc3LIzVZ9h0AaBe7svz+28q9GYLXo2/ Ax0pA+k1WmIznGhEyw5e5f0uq16U+1OBcrp9SQakoDuij+D+YsJL0HZIcLgKbi2giTDN tczg== X-Gm-Message-State: APjAAAX8hpH6vJJz/aWhDVIj3k/w4aUCjN8jyQfHWwU3VjqsdM+RpJ9B Yt/MFzvsXlJclB56BEsi4PNpwAzPSCJX8yBpYy3EdA== X-Google-Smtp-Source: APXvYqzpFAhempBHWwl6LQCKUCJ19FjjZGAWA1oF9chpT593c5XiKJbvgs2xxIRCQukRs4o+FH4Rat+2Sk/7ytURtoo= X-Received: by 2002:aa7:8e56:: with SMTP id d22mr5854475pfr.3.1573072766085; Wed, 06 Nov 2019 12:39:26 -0800 (PST) MIME-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20191105235608.107702-1-samitolvanen@google.com> <20191105235608.107702-11-samitolvanen@google.com> In-Reply-To: <20191105235608.107702-11-samitolvanen@google.com> From: Nick Desaulniers Date: Wed, 6 Nov 2019 12:39:14 -0800 Message-ID: Subject: Re: [PATCH v5 10/14] arm64: preserve x18 when CPU is suspended To: Sami Tolvanen Cc: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Dave Martin , Kees Cook , Laura Abbott , Mark Rutland , Marc Zyngier , Jann Horn , Miguel Ojeda , Masahiro Yamada , clang-built-linux , Kernel Hardening , Linux ARM , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 5, 2019 at 3:56 PM Sami Tolvanen wrote: > > Don't lose the current task's shadow stack when the CPU is suspended. > > Signed-off-by: Sami Tolvanen > Reviewed-by: Nick Desaulniers Re-LGTM > Reviewed-by: Kees Cook > --- > arch/arm64/include/asm/suspend.h | 2 +- > arch/arm64/mm/proc.S | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/suspend.h b/arch/arm64/include/asm/suspend.h > index 8939c87c4dce..0cde2f473971 100644 > --- a/arch/arm64/include/asm/suspend.h > +++ b/arch/arm64/include/asm/suspend.h > @@ -2,7 +2,7 @@ > #ifndef __ASM_SUSPEND_H > #define __ASM_SUSPEND_H > > -#define NR_CTX_REGS 12 > +#define NR_CTX_REGS 13 > #define NR_CALLEE_SAVED_REGS 12 > > /* > diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S > index fdabf40a83c8..5c8219c55948 100644 > --- a/arch/arm64/mm/proc.S > +++ b/arch/arm64/mm/proc.S > @@ -49,6 +49,8 @@ > * cpu_do_suspend - save CPU registers context > * > * x0: virtual address of context pointer > + * > + * This must be kept in sync with struct cpu_suspend_ctx in . > */ > ENTRY(cpu_do_suspend) > mrs x2, tpidr_el0 > @@ -73,6 +75,11 @@ alternative_endif > stp x8, x9, [x0, #48] > stp x10, x11, [x0, #64] > stp x12, x13, [x0, #80] > + /* > + * Save x18 as it may be used as a platform register, e.g. by shadow > + * call stack. > + */ > + str x18, [x0, #96] > ret > ENDPROC(cpu_do_suspend) > > @@ -89,6 +96,13 @@ ENTRY(cpu_do_resume) > ldp x9, x10, [x0, #48] > ldp x11, x12, [x0, #64] > ldp x13, x14, [x0, #80] > + /* > + * Restore x18, as it may be used as a platform register, and clear > + * the buffer to minimize the risk of exposure when used for shadow > + * call stack. > + */ > + ldr x18, [x0, #96] > + str xzr, [x0, #96] > msr tpidr_el0, x2 > msr tpidrro_el0, x3 > msr contextidr_el1, x4 > -- > 2.24.0.rc1.363.gb1bccd3e3d-goog > -- Thanks, ~Nick Desaulniers From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACBC8C5DF63 for ; Wed, 6 Nov 2019 20:39:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 78CBE214D8 for ; Wed, 6 Nov 2019 20:39:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fHmhuBR1"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="CrBxheWL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78CBE214D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hTa7u6I+A7TlLHHOscqxz6280LvnB63E9ifkK3M2Tzw=; b=fHmhuBR12910lU pztriEJJHtLKrz1tnQ+TxeDNfwsf46tsSZwx4OYd+yBD4cjk70DOE7KVT3WCGmhRmxsLKMATcjr/k WQSpNuu4VubGX6bpvQJD3prDvAXd0qqJ1nStgwMjzxPGdnf1zTUDQBFf9XGVtE9xncxoP/bhUfvKC HE1q5sEjOSwRCXw8B3fRiGPRW8Ui79tSqgMLJxq+W2ERQ6t8n8kRzYOnnrbknrU6UcN2Z4CuvBvNj 3VFRx5S0mbNXBBHuEN0j8+7BPebSOarR46uHeCzk4MX0JqQpztMjGz/JJArdvUVF04Ha5H2lztWp8 yu9cmJRMVU+9NbUYrkrA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSS5X-0003Gb-Jc; Wed, 06 Nov 2019 20:39:35 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSS5U-0003Fm-Ba for linux-arm-kernel@lists.infradead.org; Wed, 06 Nov 2019 20:39:33 +0000 Received: by mail-pf1-x442.google.com with SMTP id s5so11554735pfh.9 for ; Wed, 06 Nov 2019 12:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Bp86L5fucSA+9Bwlt84/eQbHaJRbEE/iIVDIU2TrYmM=; b=CrBxheWL+VkOfPX3aTBccoLvNQF92thO3oi5LNHeY04/wZsBJ5+Awp3yG38gVaW419 EwFnyiPDR1gnnZmr8ul0W/yKVfgIK5xZNdfgklRC9owvzvrb5YtTfIJlYj3tqqOBxrYA puDhDKyZABgAkq3XZb5IJ/rCNzuAn76ZWc52ybg9wLNMg+z+ZgcGsKJOYHhRkT6tP0wM ec8iwNatVcZ1mqzjbPOeUiHln+ne0fBBsTlHbQGoAkvksK/Txg3rLgikXk+7vSpyZ9Zz Pee10GCisuUq4SYMJ+mByVVfZzuStCOWn9eeJ1oEBMVnENoJixSlbPeRYZP5cyGdf0TZ UunA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Bp86L5fucSA+9Bwlt84/eQbHaJRbEE/iIVDIU2TrYmM=; b=PQdQ++1bgUepU+LytoxWaUdlTfZCJLXQxBml8oQ6IQinTOr7UfAwmb7aLH23s3IY8v X6iSneyW14madoSu+hnZOT1LeuC5NLQ25lSd0u8dvkI+wZ9r69LExdaAvVyDatbHssEq YyfpRYjSIVKcmreF0JZS1QubIlLAP823LF1HT+Vfpoc5G8bEuK6kR67uhsHSXSOYViSH pGzMCeu5CCH3HJvfANgMZi8XS9KfauvmzOW/dOKWnm3q9GdEdyBlejsjaOjgg2y8rKMa r1qm6MWQ5KVA50nLSbJkOaYabAYB+4vadusYptNs6c8977oY4s1/BAZO6aY47eJ9Yo0V FMxg== X-Gm-Message-State: APjAAAUrdVYygvGU7i+H5+nV7clCHUa1kuDl/umDjW0YUO7SrmmK9jjz PSJAIRMvDWE/VOwr8+BI7WcsPJSBm7e/dFT20RxEgQ== X-Google-Smtp-Source: APXvYqzpFAhempBHWwl6LQCKUCJ19FjjZGAWA1oF9chpT593c5XiKJbvgs2xxIRCQukRs4o+FH4Rat+2Sk/7ytURtoo= X-Received: by 2002:aa7:8e56:: with SMTP id d22mr5854475pfr.3.1573072766085; Wed, 06 Nov 2019 12:39:26 -0800 (PST) MIME-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20191105235608.107702-1-samitolvanen@google.com> <20191105235608.107702-11-samitolvanen@google.com> In-Reply-To: <20191105235608.107702-11-samitolvanen@google.com> From: Nick Desaulniers Date: Wed, 6 Nov 2019 12:39:14 -0800 Message-ID: Subject: Re: [PATCH v5 10/14] arm64: preserve x18 when CPU is suspended To: Sami Tolvanen X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191106_123932_396449_470C2831 X-CRM114-Status: GOOD ( 17.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Ard Biesheuvel , Masahiro Yamada , Catalin Marinas , Jann Horn , LKML , Steven Rostedt , Miguel Ojeda , clang-built-linux , Masami Hiramatsu , Marc Zyngier , Kernel Hardening , Laura Abbott , Will Deacon , Dave Martin , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Nov 5, 2019 at 3:56 PM Sami Tolvanen wrote: > > Don't lose the current task's shadow stack when the CPU is suspended. > > Signed-off-by: Sami Tolvanen > Reviewed-by: Nick Desaulniers Re-LGTM > Reviewed-by: Kees Cook > --- > arch/arm64/include/asm/suspend.h | 2 +- > arch/arm64/mm/proc.S | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/suspend.h b/arch/arm64/include/asm/suspend.h > index 8939c87c4dce..0cde2f473971 100644 > --- a/arch/arm64/include/asm/suspend.h > +++ b/arch/arm64/include/asm/suspend.h > @@ -2,7 +2,7 @@ > #ifndef __ASM_SUSPEND_H > #define __ASM_SUSPEND_H > > -#define NR_CTX_REGS 12 > +#define NR_CTX_REGS 13 > #define NR_CALLEE_SAVED_REGS 12 > > /* > diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S > index fdabf40a83c8..5c8219c55948 100644 > --- a/arch/arm64/mm/proc.S > +++ b/arch/arm64/mm/proc.S > @@ -49,6 +49,8 @@ > * cpu_do_suspend - save CPU registers context > * > * x0: virtual address of context pointer > + * > + * This must be kept in sync with struct cpu_suspend_ctx in . > */ > ENTRY(cpu_do_suspend) > mrs x2, tpidr_el0 > @@ -73,6 +75,11 @@ alternative_endif > stp x8, x9, [x0, #48] > stp x10, x11, [x0, #64] > stp x12, x13, [x0, #80] > + /* > + * Save x18 as it may be used as a platform register, e.g. by shadow > + * call stack. > + */ > + str x18, [x0, #96] > ret > ENDPROC(cpu_do_suspend) > > @@ -89,6 +96,13 @@ ENTRY(cpu_do_resume) > ldp x9, x10, [x0, #48] > ldp x11, x12, [x0, #64] > ldp x13, x14, [x0, #80] > + /* > + * Restore x18, as it may be used as a platform register, and clear > + * the buffer to minimize the risk of exposure when used for shadow > + * call stack. > + */ > + ldr x18, [x0, #96] > + str xzr, [x0, #96] > msr tpidr_el0, x2 > msr tpidrro_el0, x3 > msr contextidr_el1, x4 > -- > 2.24.0.rc1.363.gb1bccd3e3d-goog > -- Thanks, ~Nick Desaulniers _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22E00C5DF63 for ; Wed, 6 Nov 2019 20:39:47 +0000 (UTC) Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.kernel.org (Postfix) with SMTP id 686B621848 for ; Wed, 6 Nov 2019 20:39:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CrBxheWL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 686B621848 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kernel-hardening-return-17320-kernel-hardening=archiver.kernel.org@lists.openwall.com Received: (qmail 7567 invoked by uid 550); 6 Nov 2019 20:39:39 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Received: (qmail 7541 invoked from network); 6 Nov 2019 20:39:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Bp86L5fucSA+9Bwlt84/eQbHaJRbEE/iIVDIU2TrYmM=; b=CrBxheWL+VkOfPX3aTBccoLvNQF92thO3oi5LNHeY04/wZsBJ5+Awp3yG38gVaW419 EwFnyiPDR1gnnZmr8ul0W/yKVfgIK5xZNdfgklRC9owvzvrb5YtTfIJlYj3tqqOBxrYA puDhDKyZABgAkq3XZb5IJ/rCNzuAn76ZWc52ybg9wLNMg+z+ZgcGsKJOYHhRkT6tP0wM ec8iwNatVcZ1mqzjbPOeUiHln+ne0fBBsTlHbQGoAkvksK/Txg3rLgikXk+7vSpyZ9Zz Pee10GCisuUq4SYMJ+mByVVfZzuStCOWn9eeJ1oEBMVnENoJixSlbPeRYZP5cyGdf0TZ UunA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Bp86L5fucSA+9Bwlt84/eQbHaJRbEE/iIVDIU2TrYmM=; b=DXMo55s6+sTrrRu1f4szF6wiIDkxZGF+SLIMfeWjB8mIBiGqSSMkUhZkjYQHiI2nZU W+nZdvn0J3C8GUTVsZnd5hZP/+vJZuMr0j8s7WXZO4728JzNNkm9m9E+rodwY3FRO5xL QSPI8O45AGY5Z8Fed43JuFCRDwQKuNIwJCCyCd20b21HpYwRPmEeu1TvNV9+vYWksxwZ SuIL554+/HrNI7k/2SEW01d6i15u/UdSgO+cUfaIS9HkaFf2TiLcP+l7QY03rH2lwFOn ceBAePFUa40vjM5VR8vVkQw3FWYh5AbuXhn8nVGJFdUZ3qmSjlUS9hb+V88IG+nsjEDA Tbzg== X-Gm-Message-State: APjAAAWE2xqwDAzc+V3DU5GrFL+1wGv7ITsvp+fcIJiyUYTifdY81CKr 7bbvVD2G6jiP1crYv2I3PcPNMWSY6WwAPqfQIMCX5g== X-Google-Smtp-Source: APXvYqzpFAhempBHWwl6LQCKUCJ19FjjZGAWA1oF9chpT593c5XiKJbvgs2xxIRCQukRs4o+FH4Rat+2Sk/7ytURtoo= X-Received: by 2002:aa7:8e56:: with SMTP id d22mr5854475pfr.3.1573072766085; Wed, 06 Nov 2019 12:39:26 -0800 (PST) MIME-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20191105235608.107702-1-samitolvanen@google.com> <20191105235608.107702-11-samitolvanen@google.com> In-Reply-To: <20191105235608.107702-11-samitolvanen@google.com> From: Nick Desaulniers Date: Wed, 6 Nov 2019 12:39:14 -0800 Message-ID: Subject: Re: [PATCH v5 10/14] arm64: preserve x18 when CPU is suspended To: Sami Tolvanen Cc: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Dave Martin , Kees Cook , Laura Abbott , Mark Rutland , Marc Zyngier , Jann Horn , Miguel Ojeda , Masahiro Yamada , clang-built-linux , Kernel Hardening , Linux ARM , LKML Content-Type: text/plain; charset="UTF-8" On Tue, Nov 5, 2019 at 3:56 PM Sami Tolvanen wrote: > > Don't lose the current task's shadow stack when the CPU is suspended. > > Signed-off-by: Sami Tolvanen > Reviewed-by: Nick Desaulniers Re-LGTM > Reviewed-by: Kees Cook > --- > arch/arm64/include/asm/suspend.h | 2 +- > arch/arm64/mm/proc.S | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/suspend.h b/arch/arm64/include/asm/suspend.h > index 8939c87c4dce..0cde2f473971 100644 > --- a/arch/arm64/include/asm/suspend.h > +++ b/arch/arm64/include/asm/suspend.h > @@ -2,7 +2,7 @@ > #ifndef __ASM_SUSPEND_H > #define __ASM_SUSPEND_H > > -#define NR_CTX_REGS 12 > +#define NR_CTX_REGS 13 > #define NR_CALLEE_SAVED_REGS 12 > > /* > diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S > index fdabf40a83c8..5c8219c55948 100644 > --- a/arch/arm64/mm/proc.S > +++ b/arch/arm64/mm/proc.S > @@ -49,6 +49,8 @@ > * cpu_do_suspend - save CPU registers context > * > * x0: virtual address of context pointer > + * > + * This must be kept in sync with struct cpu_suspend_ctx in . > */ > ENTRY(cpu_do_suspend) > mrs x2, tpidr_el0 > @@ -73,6 +75,11 @@ alternative_endif > stp x8, x9, [x0, #48] > stp x10, x11, [x0, #64] > stp x12, x13, [x0, #80] > + /* > + * Save x18 as it may be used as a platform register, e.g. by shadow > + * call stack. > + */ > + str x18, [x0, #96] > ret > ENDPROC(cpu_do_suspend) > > @@ -89,6 +96,13 @@ ENTRY(cpu_do_resume) > ldp x9, x10, [x0, #48] > ldp x11, x12, [x0, #64] > ldp x13, x14, [x0, #80] > + /* > + * Restore x18, as it may be used as a platform register, and clear > + * the buffer to minimize the risk of exposure when used for shadow > + * call stack. > + */ > + ldr x18, [x0, #96] > + str xzr, [x0, #96] > msr tpidr_el0, x2 > msr tpidrro_el0, x3 > msr contextidr_el1, x4 > -- > 2.24.0.rc1.363.gb1bccd3e3d-goog > -- Thanks, ~Nick Desaulniers