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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 38BD1C282DD for ; Thu, 9 Jan 2020 14:47:12 +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 0341420721 for ; Thu, 9 Jan 2020 14:47:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KZcwJhMk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0341420721 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=hkltuBbEPEKqOw/GVjj/1v0qYozSEdZ3C5GPGAzVnuA=; b=KZcwJhMkBjbmgY t++jM22+WtEqcl9xaQ57zKYK/+UXIlOtSXXw8AZC5ZCqGX4BJZVFNVaN9ZrmF0SrnJvqinV9WSWYJ h8RNd1wkWg6UUHBsLs3NajUXXfDCWh0jEo3KvDcuBHILlE3Mgh/KVgAkJNUMPNIqxuVb4St6DFDsI lrYfcRcol3IHeXN0GZk8F2rJLakgxKB1lP4ctJnitKmTFz2NWWJXWE9njt0uVWwmLGvsp9kBK8XWW JvhYQXB5w565BP3cm+mSBtx5UJAqHjhU1bJ4/BwSReenJES1XraSd8menP1rNlGVIHLEXiUaFHtpH aYW6RZLCkEYhHPTDtrFA==; 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 1ipZ5Y-0001Sx-Ji; Thu, 09 Jan 2020 14:47:08 +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 1ipZ5H-0001FJ-L5 for linux-arm-kernel@lists.infradead.org; Thu, 09 Jan 2020 14:46:53 +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 9E1571FB; Thu, 9 Jan 2020 06:46:50 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 26D383F534; Thu, 9 Jan 2020 06:46:49 -0800 (PST) Date: Thu, 9 Jan 2020 14:46:47 +0000 From: Mark Rutland To: Laura Abbott Subject: Re: [PATCH 05/17] arm64: entry: add a call_on_stack helper Message-ID: <20200109144646.GF3112@lakrids.cambridge.arm.com> References: <20200108185634.1163-1-mark.rutland@arm.com> <20200108185634.1163-6-mark.rutland@arm.com> <5fdf8bfe-a0a9-350c-e3f5-6621ce4fc564@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5fdf8bfe-a0a9-350c-e3f5-6621ce4fc564@redhat.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200109_064651_729300_6C9A4BB5 X-CRM114-Status: GOOD ( 18.06 ) 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: keescook@chromium.org, catalin.marinas@arm.com, robin.murphy@arm.com, broonie@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, maz@kernel.org, will@kernel.org, linux-arm-kernel@lists.infradead.org, alex.popov@linux.com 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 Thu, Jan 09, 2020 at 09:30:13AM -0500, Laura Abbott wrote: > On 1/8/20 1:56 PM, Mark Rutland wrote: > > In some cases, we want to call a function from C code, using an > > alternative stack. Add a helper that we can use in such cases. > > > > Signed-off-by: Mark Rutland > > Cc: Catalin Marinas > > Cc: James Morse > > Cc: Will Deacon > > --- > > arch/arm64/include/asm/exception.h | 2 ++ > > arch/arm64/kernel/entry.S | 21 +++++++++++++++++++++ > > 2 files changed, 23 insertions(+) > > > > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h > > index b87c6e276ab1..a49038fa4faf 100644 > > --- a/arch/arm64/include/asm/exception.h > > +++ b/arch/arm64/include/asm/exception.h > > @@ -31,6 +31,8 @@ static inline u32 disr_to_esr(u64 disr) > > return esr; > > } > > +asmlinkage void call_on_stack(struct pt_regs *, void (*)(struct pt_regs *), > > + unsigned long); > > asmlinkage void enter_from_user_mode(void); > > void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > > void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > > index 53ce1877a4aa..184313c773ea 100644 > > --- a/arch/arm64/kernel/entry.S > > +++ b/arch/arm64/kernel/entry.S > > @@ -901,6 +901,27 @@ ENTRY(ret_from_fork) > > ENDPROC(ret_from_fork) > > NOKPROBE(ret_from_fork) > > +/* > > + * x0 = argument to function > > + * x1 = function to call > > + * x2 = new stack pointer > > + */ > > +ENTRY(call_on_stack) > > + /* Create a frame record to save our LR and SP (implicit in FP) */ > > + stp x29, x30, [sp, #-16]! > > + mov x29, sp > > + > > + /* Move to the new stack and call the function there */ > > + mov sp, x2 > > + blr x1 > > + > > + /* Restore SP from the FP, FP and LR from the record, and return */ > > + mov sp, x29 > > + ldp x29, x30, [sp], #16 > > + ret > > +ENDPROC(call_on_stack) > > +NOKPROBE(call_on_stack) > > + > > #ifdef CONFIG_ARM_SDE_INTERFACE > > #include > > > > I'm a little worried this makes a very tempting gadget for > attackers to use. Maybe future security features will > make this less vulnerable? With BTI we'll have to add a target identifier to the start of the function, but that's about it. As a gadget, I think it's similar to the existing cpu_switch_to(). If we could protect assembly functions with CFI somehow that'd be great for both. Thanks, Mark. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel