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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 9F261C33CB1 for ; Fri, 17 Jan 2020 10:31:53 +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 6C80B2082F for ; Fri, 17 Jan 2020 10:31:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DBx/mgBh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C80B2082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Vi5t76+m9iTJDjJQy+GLb11EpMpa4XindIP47jvnrVk=; b=DBx/mgBh0DP64J aCRlVnD0Zs+zs0BpMBHimB4hVdh4b7H97FTsQyivMxcrtfF/Fzb+JycZUwEveOXrMvdhm/K8AbE+J ItexesJpIGnV2wBbhDKdRkzGXmClf+ihD8upn1Wq13eJsRqjirBytn/GJmmth4eRllWhVJTgGoCjX xi2L/HldUtJk6KzNNm8nn6gC9SD16racbil01HQMkuT7a6fMUPd6Oxw++G82Eov8zeeZ7pr03c/GP kAUgAOD9W+bld+7O14rKZs/wpGNC0oxFGM3+s8g9azj1I9MVHXipDNTEPoTFuyb1TdYjJ2oAgfLRU YxC3bbx27RKxdulOVBFQ==; 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 1isOuu-00013y-NQ; Fri, 17 Jan 2020 10:31:52 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1isOuk-000136-MN for linux-arm-kernel@lists.infradead.org; Fri, 17 Jan 2020 10:31:50 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E59E211D4; Fri, 17 Jan 2020 02:31:41 -0800 (PST) Received: from arrakis.emea.arm.com (arrakis.cambridge.arm.com [10.1.197.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2BEAC3F68E; Fri, 17 Jan 2020 02:31:40 -0800 (PST) Date: Fri, 17 Jan 2020 10:31:38 +0000 From: Catalin Marinas To: Amit Daniel Kachhap Subject: Re: [PATCH v3 12/16] arm64: suspend: restore the kernel ptrauth keys Message-ID: <20200117103138.GD26090@arrakis.emea.arm.com> References: <1576486038-9899-1-git-send-email-amit.kachhap@arm.com> <1576486038-9899-13-git-send-email-amit.kachhap@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1576486038-9899-13-git-send-email-amit.kachhap@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200117_023144_088260_23226B81 X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. 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 , Suzuki K Poulose , Ard Biesheuvel , Richard Henderson , Kristina Martsenko , James Morse , Ramana Radhakrishnan , Mark Brown , Vincenzo Frascino , Will Deacon , Dave Martin , linux-arm-kernel@lists.infradead.org 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 Mon, Dec 16, 2019 at 02:17:14PM +0530, Amit Daniel Kachhap wrote: > diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S > index 7b2f2e6..a6e9460 100644 > --- a/arch/arm64/kernel/sleep.S > +++ b/arch/arm64/kernel/sleep.S > @@ -2,6 +2,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -139,6 +140,11 @@ ENTRY(_cpu_resume) > bl kasan_unpoison_task_stack_below > #endif > > +#ifdef CONFIG_ARM64_PTR_AUTH > + get_current_task x1 > + ptrauth_keys_install_kernel x1, x2, x3, x4 > +#endif We should initialise the keys earlier since kasan_unpoison_task_stack_below() is a C function. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel