From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 66553740034 for ; Tue, 12 Dec 2023 08:36:08 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=vfkTN0xm5JW6zErVmF5ploKaeEhAM8pel4m/FuWyQFQ=; c=relaxed/simple; d=groups.io; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1702370166; v=1; b=tfxtn0M2LdDp7we8q0b/SM6o9eh6JbyvC1Z2XAL77PZhR9J/pd6HpDFnQ1tAdRbHTlvYEssm KGmPZ6839bSupeD8p43VUuaJPLXrD/obDbNfzWB6HftMNNe46ZAk/85TyO42Ia7SZYSIEpdMTX0 BHhKxStes0w7sJRl/sdmZTok= X-Received: by 127.0.0.2 with SMTP id TO9kYY7687511xpoVPS3WsSW; Tue, 12 Dec 2023 00:36:06 -0800 X-Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by mx.groups.io with SMTP id smtpd.web11.12412.1702370165974426915 for ; Tue, 12 Dec 2023 00:36:06 -0800 X-Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3334b472196so4473154f8f.1 for ; Tue, 12 Dec 2023 00:36:05 -0800 (PST) X-Gm-Message-State: eq2y32NzR64Qi20lgV433RwSx7686176AA= X-Google-Smtp-Source: AGHT+IFdIEWArVH52kE3Ov3gL3ZIf/BHp0puSSDTA5ilKlPiZiU2tMwHIdXJayDyeBRx3WJKAedK+6ZX X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6000:1549:b0:336:2ee0:1ccf with SMTP id 9-20020a056000154900b003362ee01ccfmr2781wry.0.1702370163716; Tue, 12 Dec 2023 00:36:03 -0800 (PST) Date: Tue, 12 Dec 2023 09:36:00 +0100 Mime-Version: 1.0 Message-ID: <20231212083600.1889189-1-ardb@google.com> Subject: [edk2-devel] [PATCH v4] ArmVirt: Allow memory attributes protocol to be disabled From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Gerd Hoffmann , Oliver Steffen , Alexander Graf , Oliver Smith-Denny , Taylor Beebe , Peter Jones , Leif Lindholm , Laszlo Ersek Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ardb@kernel.org List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=tfxtn0M2; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Ard Biesheuvel Shim's PE loader uses the EFI memory attributes protocol in a way that results in an immediate crash when invoking the loaded image, unless the base and size of its executable segment are both aligned to 4k. If this is not the case, it will strip the memory allocation of its executable permissions, but fail to add them back for the executable region, resulting in non-executable code. Unfortunately, the PE loader does not even bother invoking the protocol in this case (as it notices the misalignment), making it very hard for system firmware to work around this by attempting to infer the intent of the caller. So let's introduce a QEMU command line option to indicate that the protocol should not be exposed at all, and a PCD to set the default for this option when it is omitted. -fw_cfg opt/org.tianocore/UninstallMemAttrProtocol,string=y Cc: Gerd Hoffmann Cc: Oliver Steffen Cc: Alexander Graf Cc: Oliver Smith-Denny Cc: Taylor Beebe Cc: Peter Jones Cc: Leif Lindholm Link: https://gitlab.com/qemu-project/qemu/-/issues/1990 Reviewed-by: Laszlo Ersek Signed-off-by: Ard Biesheuvel --- v4: - add diagnostic print to DEBUG builds, drop v2 related comment v3: - drop first boot logic v2: - uninstall protocol on first boot only, add PCD to define default ArmVirtPkg/ArmVirtPkg.dec | 6 ++ ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 3 + ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 64 ++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec index 0f2d7873279f..313aebda902a 100644 --- a/ArmVirtPkg/ArmVirtPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -68,3 +68,9 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] # Cloud Hypervisor has no other way to pass Rsdp address to the guest except use a PCD. # gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x0|UINT64|0x00000005 + + ## + # Whether the EFI memory attributes protocol should be uninstalled before + # invoking the OS loader. This may be needed to work around problematic + # builds of shim that use the protocol incorrectly. + gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol|FALSE|BOOLEAN|0x00000006 diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 997eb1a4429f..70e4ebf94ad9 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -46,6 +46,7 @@ [LibraryClasses] PcdLib PlatformBmPrintScLib QemuBootOrderLib + QemuFwCfgSimpleParserLib QemuLoadImageLib ReportStatusCodeLib TpmPlatformHierarchyLib @@ -55,6 +56,7 @@ [LibraryClasses] UefiRuntimeServicesTableLib [FixedPcd] + gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity @@ -73,5 +75,6 @@ [Guids] [Protocols] gEfiFirmwareVolume2ProtocolGuid gEfiGraphicsOutputProtocolGuid + gEfiMemoryAttributeProtocolGuid gEfiPciRootBridgeIoProtocolGuid gVirtioDeviceProtocolGuid diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 85c01351b09d..8e93f3cfed1b 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1111,6 +1112,49 @@ PlatformBootManagerBeforeConsole ( FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciSerial, SetupVirtioSerial); } +/** + Uninstall the EFI memory attribute protocol if it exists. +**/ +STATIC +VOID +UninstallEfiMemoryAttributesProtocol ( + VOID + ) +{ + EFI_STATUS Status; + EFI_HANDLE Handle; + UINTN Size; + VOID *MemoryAttributeProtocol; + + Size = sizeof (Handle); + Status = gBS->LocateHandle ( + ByProtocol, + &gEfiMemoryAttributeProtocolGuid, + NULL, + &Size, + &Handle + ); + + if (EFI_ERROR (Status)) { + ASSERT (Status == EFI_NOT_FOUND); + return; + } + + Status = gBS->HandleProtocol ( + Handle, + &gEfiMemoryAttributeProtocolGuid, + &MemoryAttributeProtocol + ); + ASSERT_EFI_ERROR (Status); + + Status = gBS->UninstallProtocolInterface ( + Handle, + &gEfiMemoryAttributeProtocolGuid, + MemoryAttributeProtocol + ); + ASSERT_EFI_ERROR (Status); +} + /** Do the platform specific action after the console is ready Possible things that can be done in PlatformBootManagerAfterConsole: @@ -1129,12 +1173,32 @@ PlatformBootManagerAfterConsole ( ) { RETURN_STATUS Status; + BOOLEAN Uninstall; // // Show the splash screen. // BootLogoEnableLogo (); + // + // Work around shim's terminally broken use of the EFI memory attributes + // protocol, by uninstalling it if requested on the QEMU command line. + // + // E.g., + // -fw_cfg opt/org.tianocore/UninstallMemAttrProtocol,string=y + // + Uninstall = FixedPcdGetBool (PcdUninstallMemAttrProtocol); + QemuFwCfgParseBool ("opt/org.tianocore/UninstallMemAttrProtocol", &Uninstall); + DEBUG (( + DEBUG_WARN, + "%a: %auninstalling EFI memory protocol\n", + __func__, + Uninstall ? "" : "not " + )); + if (Uninstall) { + UninstallEfiMemoryAttributesProtocol (); + } + // // Process QEMU's -kernel command line option. The kernel booted this way // will receive ACPI tables: in PlatformBootManagerBeforeConsole(), we -- 2.43.0.472.g3155946c3a-goog -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112361): https://edk2.groups.io/g/devel/message/112361 Mute This Topic: https://groups.io/mt/103126734/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-