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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30C81C46467 for ; Wed, 4 Jan 2023 14:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239295AbjADOnI (ORCPT ); Wed, 4 Jan 2023 09:43:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239671AbjADOmi (ORCPT ); Wed, 4 Jan 2023 09:42:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17267188; Wed, 4 Jan 2023 06:42:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A393D6176B; Wed, 4 Jan 2023 14:42:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA3CEC433F2; Wed, 4 Jan 2023 14:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672843356; bh=2h6S36bZJ85jADuzLHYnhUt+Q2Kq22quMH8ZU54eN8c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=cjVd33us2AS+rA9ls3Z47M+j6oGpkMzpBLYCVej146IZ7dho6+IDlN2eVyCAzilwb Re7dfGegDBUc3CxEEfNsEbLj58NEu/8DIAWUAXR1A3TjHriVXFGd3Mi1EpaEGnSuli jwnGTH2m62ntlBchVJoWRykTOXlLov+xkcKk/Apz8xpEhxKi/seIfRVhd5dXByYndK KnTvWvDcEWwY+DCOyPkag504YwAjp8UnmzswlGQbUjjmvzTH03XPnaDFCAfpxCdiut MBiISMlJsw63dSfizcCVt1LwZYb030tZR9BFDEB2ErXmeKFye7LOSJF47IE0CKT3gz FAxHFm5pL70zw== Date: Wed, 4 Jan 2023 14:42:30 +0000 From: Lee Jones To: Ard Biesheuvel Cc: stable@vger.kernel.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, Sami Tolvanen , Kees Cook Subject: Re: [PATCH 1/2] arm64: efi: Execute runtime services from a dedicated stack Message-ID: References: <20221205201210.463781-1-ardb@kernel.org> <20221205201210.463781-2-ardb@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org On Wed, 04 Jan 2023, Ard Biesheuvel wrote: > On Wed, 4 Jan 2023 at 11:40, Lee Jones wrote: > > > > On Mon, 05 Dec 2022, Ard Biesheuvel wrote: > > > > > With the introduction of PRMT in the ACPI subsystem, the EFI rts > > > workqueue is no longer the only caller of efi_call_virt_pointer() in the > > > kernel. This means the EFI runtime services lock is no longer sufficient > > > to manage concurrent calls into firmware, but also that firmware calls > > > may occur that are not marshalled via the workqueue mechanism, but > > > originate directly from the caller context. > > > > > > For added robustness, and to ensure that the runtime services have 8 KiB > > > of stack space available as per the EFI spec, introduce a spinlock > > > protected EFI runtime stack of 8 KiB, where the spinlock also ensures > > > serialization between the EFI rts workqueue (which itself serializes EFI > > > runtime calls) and other callers of efi_call_virt_pointer(). > > > > > > While at it, use the stack pivot to avoid reloading the shadow call > > > stack pointer from the ordinary stack, as doing so could produce a > > > gadget to defeat it. > > > > > > Signed-off-by: Ard Biesheuvel > > > --- > > > arch/arm64/include/asm/efi.h | 3 +++ > > > arch/arm64/kernel/efi-rt-wrapper.S | 13 +++++++++- > > > arch/arm64/kernel/efi.c | 25 ++++++++++++++++++++ > > > 3 files changed, 40 insertions(+), 1 deletion(-) > > > > Could we have this in Stable please? > > > > Upstream commit: ff7a167961d1b ("arm64: efi: Execute runtime services from a dedicated stack") > > > > Ard, do we need Patch 2 as well, or can this be applied on its own? > > > > Thanks for the reminder. > > Only patch #1 is needed. It should be applied to v5.10 and later. Perfect, thanks Ard. -- Lee Jones [李琼斯] 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 48BA8C4332F for ; Wed, 4 Jan 2023 15:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=7QsKE27mxwggWNPMNhsgeu6oDsty8KJeDQUPibgPaRE=; b=gDEZA7JsaVBxOo QpYlxpRlfXpJx/P0WrkOViMcbSMoniefc9crde5XR6k2gXSWdb1/fA8byFgHvpyyczvWkUynQh3pF gAbPxVC8dg648cqVH/MGWFT1drrIpd2p3aOAVJMmf8FP6JrZCSL2bZipkDb5XgfLXUNTUde122eGF LnNsJ/m4hbvO9Y00mL7ImWmw0wIsEtyhuIpBuduqz9QNTCgE+ZenTrpJ1Q0JHV3ZL2ciljMwXNxcx D8cDtR4ywQGizCXD3HLoandL1yULGn1AhK+JR0OTFLw02vl8v+xPz0Qi1ZyeHo77/qayinb2L2Alh yBz61DnHjZGXqQYaaSFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pD5O1-009yDH-Mp; Wed, 04 Jan 2023 15:09:01 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pD4yV-009n5F-H1 for linux-arm-kernel@lists.infradead.org; Wed, 04 Jan 2023 14:42:40 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A087E6174F; Wed, 4 Jan 2023 14:42:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA3CEC433F2; Wed, 4 Jan 2023 14:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672843356; bh=2h6S36bZJ85jADuzLHYnhUt+Q2Kq22quMH8ZU54eN8c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=cjVd33us2AS+rA9ls3Z47M+j6oGpkMzpBLYCVej146IZ7dho6+IDlN2eVyCAzilwb Re7dfGegDBUc3CxEEfNsEbLj58NEu/8DIAWUAXR1A3TjHriVXFGd3Mi1EpaEGnSuli jwnGTH2m62ntlBchVJoWRykTOXlLov+xkcKk/Apz8xpEhxKi/seIfRVhd5dXByYndK KnTvWvDcEWwY+DCOyPkag504YwAjp8UnmzswlGQbUjjmvzTH03XPnaDFCAfpxCdiut MBiISMlJsw63dSfizcCVt1LwZYb030tZR9BFDEB2ErXmeKFye7LOSJF47IE0CKT3gz FAxHFm5pL70zw== Date: Wed, 4 Jan 2023 14:42:30 +0000 From: Lee Jones To: Ard Biesheuvel Cc: stable@vger.kernel.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, Sami Tolvanen , Kees Cook Subject: Re: [PATCH 1/2] arm64: efi: Execute runtime services from a dedicated stack Message-ID: References: <20221205201210.463781-1-ardb@kernel.org> <20221205201210.463781-2-ardb@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230104_064239_661468_0F2B3290 X-CRM114-Status: GOOD ( 26.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gV2VkLCAwNCBKYW4gMjAyMywgQXJkIEJpZXNoZXV2ZWwgd3JvdGU6Cgo+IE9uIFdlZCwgNCBK YW4gMjAyMyBhdCAxMTo0MCwgTGVlIEpvbmVzIDxsZWVAa2VybmVsLm9yZz4gd3JvdGU6Cj4gPgo+ ID4gT24gTW9uLCAwNSBEZWMgMjAyMiwgQXJkIEJpZXNoZXV2ZWwgd3JvdGU6Cj4gPgo+ID4gPiBX aXRoIHRoZSBpbnRyb2R1Y3Rpb24gb2YgUFJNVCBpbiB0aGUgQUNQSSBzdWJzeXN0ZW0sIHRoZSBF RkkgcnRzCj4gPiA+IHdvcmtxdWV1ZSBpcyBubyBsb25nZXIgdGhlIG9ubHkgY2FsbGVyIG9mIGVm aV9jYWxsX3ZpcnRfcG9pbnRlcigpIGluIHRoZQo+ID4gPiBrZXJuZWwuIFRoaXMgbWVhbnMgdGhl IEVGSSBydW50aW1lIHNlcnZpY2VzIGxvY2sgaXMgbm8gbG9uZ2VyIHN1ZmZpY2llbnQKPiA+ID4g dG8gbWFuYWdlIGNvbmN1cnJlbnQgY2FsbHMgaW50byBmaXJtd2FyZSwgYnV0IGFsc28gdGhhdCBm aXJtd2FyZSBjYWxscwo+ID4gPiBtYXkgb2NjdXIgdGhhdCBhcmUgbm90IG1hcnNoYWxsZWQgdmlh IHRoZSB3b3JrcXVldWUgbWVjaGFuaXNtLCBidXQKPiA+ID4gb3JpZ2luYXRlIGRpcmVjdGx5IGZy b20gdGhlIGNhbGxlciBjb250ZXh0Lgo+ID4gPgo+ID4gPiBGb3IgYWRkZWQgcm9idXN0bmVzcywg YW5kIHRvIGVuc3VyZSB0aGF0IHRoZSBydW50aW1lIHNlcnZpY2VzIGhhdmUgOCBLaUIKPiA+ID4g b2Ygc3RhY2sgc3BhY2UgYXZhaWxhYmxlIGFzIHBlciB0aGUgRUZJIHNwZWMsIGludHJvZHVjZSBh IHNwaW5sb2NrCj4gPiA+IHByb3RlY3RlZCBFRkkgcnVudGltZSBzdGFjayBvZiA4IEtpQiwgd2hl cmUgdGhlIHNwaW5sb2NrIGFsc28gZW5zdXJlcwo+ID4gPiBzZXJpYWxpemF0aW9uIGJldHdlZW4g dGhlIEVGSSBydHMgd29ya3F1ZXVlICh3aGljaCBpdHNlbGYgc2VyaWFsaXplcyBFRkkKPiA+ID4g cnVudGltZSBjYWxscykgYW5kIG90aGVyIGNhbGxlcnMgb2YgZWZpX2NhbGxfdmlydF9wb2ludGVy KCkuCj4gPiA+Cj4gPiA+IFdoaWxlIGF0IGl0LCB1c2UgdGhlIHN0YWNrIHBpdm90IHRvIGF2b2lk IHJlbG9hZGluZyB0aGUgc2hhZG93IGNhbGwKPiA+ID4gc3RhY2sgcG9pbnRlciBmcm9tIHRoZSBv cmRpbmFyeSBzdGFjaywgYXMgZG9pbmcgc28gY291bGQgcHJvZHVjZSBhCj4gPiA+IGdhZGdldCB0 byBkZWZlYXQgaXQuCj4gPiA+Cj4gPiA+IFNpZ25lZC1vZmYtYnk6IEFyZCBCaWVzaGV1dmVsIDxh cmRiQGtlcm5lbC5vcmc+Cj4gPiA+IC0tLQo+ID4gPiAgYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9l ZmkuaCAgICAgICB8ICAzICsrKwo+ID4gPiAgYXJjaC9hcm02NC9rZXJuZWwvZWZpLXJ0LXdyYXBw ZXIuUyB8IDEzICsrKysrKysrKy0KPiA+ID4gIGFyY2gvYXJtNjQva2VybmVsL2VmaS5jICAgICAg ICAgICAgfCAyNSArKysrKysrKysrKysrKysrKysrKwo+ID4gPiAgMyBmaWxlcyBjaGFuZ2VkLCA0 MCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4gPgo+ID4gQ291bGQgd2UgaGF2ZSB0aGlz IGluIFN0YWJsZSBwbGVhc2U/Cj4gPgo+ID4gVXBzdHJlYW0gY29tbWl0OiBmZjdhMTY3OTYxZDFi ICgiYXJtNjQ6IGVmaTogRXhlY3V0ZSBydW50aW1lIHNlcnZpY2VzIGZyb20gYSBkZWRpY2F0ZWQg c3RhY2siKQo+ID4KPiA+IEFyZCwgZG8gd2UgbmVlZCBQYXRjaCAyIGFzIHdlbGwsIG9yIGNhbiB0 aGlzIGJlIGFwcGxpZWQgb24gaXRzIG93bj8KPiA+Cj4gCj4gVGhhbmtzIGZvciB0aGUgcmVtaW5k ZXIuCj4gCj4gT25seSBwYXRjaCAjMSBpcyBuZWVkZWQuIEl0IHNob3VsZCBiZSBhcHBsaWVkIHRv IHY1LjEwIGFuZCBsYXRlci4KClBlcmZlY3QsIHRoYW5rcyBBcmQuCgotLSAKTGVlIEpvbmVzIFvm nY7nkLzmlq9dCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmlu ZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9s aW51eC1hcm0ta2VybmVsCg==