From nobody Fri May 17 00:30:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+112289+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+112289+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1702291229; cv=none; d=zohomail.com; s=zohoarc; b=iZ3pBos0K707S92LB0asXY6fZkJaHEE2TuofbtCU0fxvDbxMLmUGAaMolU6Fmny2yIgakviUcwOP8bD0OGJtOpPlFhJ4TVywYBcYWZ8tS0DKVmei3/fkv6AsG9UlrZ+ikkhuYeE89wHr3/DTdmrhGVpisfVdFBoZ3hMncwHHFn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702291229; h=Content-Type:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=BrDYllQe+1/HHXTER+LGLmIwswFfKqhOgrJN8oVHzB0=; b=XWCpmA+HCsrqX7eIYn04s629qZ3TNs+QcDR3vkw/NbRZXnqJaLE3k3KZ7gEi51WxcTtHeNhEtR0HT9r9kaCNHTY4rXyvJdapQIRjCT2cDv5AKpY9irBxUraIzNwZCfD4aiaCveyLzFdHMHsBkbUuLgx1X+0cKDoCfaMB4KxsYB0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+112289+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1702291229895867.7837888449732; Mon, 11 Dec 2023 02:40:29 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=G+faaCke5xUBeNqjoJtGzraOX0DgEA+vWaD35Q0GUgM=; 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=1702291229; v=1; b=QSiobpcNp7NL6ylK4GMoFXd8BwjFILYXK0DyQ9VXiEIixyuDOSy4vHE6e/p6NXWM5a7aGfPb MsgBR9MO6P4bVZdV7RXFHjSbzQbUN9HvXxlpPbrkO3rHbu7Oy6ca99owodOvVrOmxvzoSkKdeOQ LvcESu/9ubwb8BBeHpkygPV0= X-Received: by 127.0.0.2 with SMTP id wgFDYY1788612x4zkY8lYxEF; Mon, 11 Dec 2023 02:40:29 -0800 X-Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by mx.groups.io with SMTP id smtpd.web10.5656.1702291228837665719 for ; Mon, 11 Dec 2023 02:40:29 -0800 X-Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5d42c43d8daso27722987b3.0 for ; Mon, 11 Dec 2023 02:40:28 -0800 (PST) X-Gm-Message-State: MldcdQZDroXnHyN1yEXzgmyMx1787277AA= X-Google-Smtp-Source: AGHT+IE1LI4QkonPQMr9MQKviy6VmzUMiL7nw1N9jULbo2UQxnNCVKQymDM0APD3eUYwms26+x9ApxFk X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:690c:83:b0:5d6:f1d2:2e5e with SMTP id be3-20020a05690c008300b005d6f1d22e5emr74216ywb.0.1702291227513; Mon, 11 Dec 2023 02:40:27 -0800 (PST) Date: Mon, 11 Dec 2023 11:40:24 +0100 Mime-Version: 1.0 Message-ID: <20231211104024.185070-1-ardb@google.com> Subject: [edk2-devel] [PATCH v3] ArmVirt: Allow memory attributes protocol to be disabled From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Laszlo Ersek , Gerd Hoffmann , Oliver Steffen , Alexander Graf , Oliver Smith-Denny , Taylor Beebe , Peter Jones , Leif Lindholm 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: X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1702291230497100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3Dy Cc: Laszlo Ersek 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 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirtPkg.dec | 6 = ++ ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 3 + ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 62 = ++++++++++++++++++++ 3 files changed, 71 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 ex= cept use a PCD. # gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x0|UINT64|0x000000= 05 + + ## + # 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|0x00000= 006 diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerL= ib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.i= nf 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/ArmVi= rtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 85c01351b09d..a1a2bca2af3d 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, SetupVirtio= Serial); } +/** + Uninstall the EFI memory attribute protocol if it exists. +**/ +STATIC +VOID +UninstallEfiMemoryAttributesProtocol ( + VOID + ) +{ + EFI_STATUS Status; + EFI_HANDLE Handle; + UINTN Size; + VOID *MemoryAttributeProtocol; + + Size =3D sizeof (Handle); + Status =3D gBS->LocateHandle ( + ByProtocol, + &gEfiMemoryAttributeProtocolGuid, + NULL, + &Size, + &Handle + ); + + if (EFI_ERROR (Status)) { + ASSERT (Status =3D=3D EFI_NOT_FOUND); + return; + } + + Status =3D gBS->HandleProtocol ( + Handle, + &gEfiMemoryAttributeProtocolGuid, + &MemoryAttributeProtocol + ); + ASSERT_EFI_ERROR (Status); + + Status =3D 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,30 @@ 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=3Dy + // + // This is only needed on the first boot, when fbaa64.efi is being invok= ed to + // set the boot order variables. Subsequent boots involving GRUB are not + // affected. + // + Uninstall =3D FixedPcdGetBool (PcdUninstallMemAttrProtocol); + QemuFwCfgParseBool ("opt/org.tianocore/UninstallMemAttrProtocol", &Unins= tall); + 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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112289): https://edk2.groups.io/g/devel/message/112289 Mute This Topic: https://groups.io/mt/103106391/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-