From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org
Cc: agraf@suse.de, Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Zimmer Vincent <vincent.zimmer@intel.com>,
Brian Richardson <brian.richardson@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Andrew Fish <afish@apple.com>, Laszlo Ersek <lersek@redhat.com>,
Leif Lindholm <leif.lindholm@linaro.org>,
Star Zeng <star.zeng@intel.com>, Eric Dong <eric.dong@intel.com>,
Ruiyu Ni <ruiyu.ni@intel.com>
Subject: [PATCH 4/4] MdeModulePkg/UefiBootManagerLib: allow foreign Driver#### images
Date: Wed, 12 Sep 2018 15:21:51 +0200 [thread overview]
Message-ID: <20180912132151.4258-5-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20180912132151.4258-1-ard.biesheuvel@linaro.org>
Allow PE/COFF images that must execute under emulation for Driver####
options, by relaxing the machine type check to include support for
machine types that is provided by the emulator.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c | 26 +++++++++++++++++++-
MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h | 1 +
MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf | 1 +
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
index 7bf96646c690..67e3dfd7e9e1 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
@@ -1185,6 +1185,29 @@ EfiBootManagerFreeLoadOptions (
return EFI_SUCCESS;
}
+STATIC
+BOOLEAN
+BmIsImageTypeSupported (
+ IN UINT16 MachineType,
+ IN UINT16 SubSystem
+ )
+{
+ EFI_STATUS Status;
+ EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emu;
+
+ if (EFI_IMAGE_MACHINE_TYPE_SUPPORTED (MachineType)) {
+ return TRUE;
+ }
+
+ Status = gBS->LocateProtocol (&gEdkiiPeCoffImageEmulatorProtocolGuid,
+ NULL, (VOID **)&Emu);
+ if (EFI_ERROR (Status)) {
+ return FALSE;
+ }
+
+ return Emu->IsImageSupported (Emu, MachineType, SubSystem);
+}
+
/**
Return whether the PE header of the load option is valid or not.
@@ -1235,7 +1258,8 @@ BmIsLoadOptionPeHeaderValid (
OptionalHeader = (EFI_IMAGE_OPTIONAL_HEADER32 *) &PeHeader->Pe32.OptionalHeader;
if ((OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC ||
OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) &&
- EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeHeader->Pe32.FileHeader.Machine)
+ BmIsImageTypeSupported (PeHeader->Pe32.FileHeader.Machine,
+ OptionalHeader->Subsystem)
) {
//
// Check the Subsystem:
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
index 978fbff966f6..5f64ef304b87 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
+++ b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
@@ -47,6 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/VariableLock.h>
#include <Protocol/RamDisk.h>
#include <Protocol/DeferredImageLoad.h>
+#include <Protocol/PeCoffImageEmulator.h>
#include <Guid/MemoryTypeInformation.h>
#include <Guid/FileInfo.h>
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
index 72c5ca1cd59e..09e2134acf8e 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+++ b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -104,6 +104,7 @@
gEfiDevicePathProtocolGuid ## SOMETIMES_CONSUMES
gEfiBootLogoProtocolGuid ## SOMETIMES_CONSUMES
gEfiSimpleTextInputExProtocolGuid ## SOMETIMES_CONSUMES
+ gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES
gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES
gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES
gEfiUsbIoProtocolGuid ## SOMETIMES_CONSUMES
--
2.17.1
next prev parent reply other threads:[~2018-09-12 13:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 13:21 [PATCH 0/4] MdeModulePkg: add support for dispatching foreign arch PE/COFF images Ard Biesheuvel
2018-09-12 13:21 ` [PATCH 1/4] MdeModulePkg: introduce PE/COFF image emulator protocol Ard Biesheuvel
2018-09-13 10:05 ` Zeng, Star
2018-09-13 10:36 ` Ard Biesheuvel
2018-09-12 13:21 ` [PATCH 2/4] MdeModulePkg/DxeCore: invoke the emulator protocol for foreign images Ard Biesheuvel
2018-09-13 10:23 ` Zeng, Star
2018-09-13 10:37 ` Ard Biesheuvel
2018-09-12 13:21 ` [PATCH 3/4] MdeModulePkg/PciBusDxe: invoke PE/COFF emulator for foreign option ROMs Ard Biesheuvel
2018-09-13 10:24 ` Zeng, Star
2018-09-13 10:46 ` Ard Biesheuvel
2018-09-12 13:21 ` Ard Biesheuvel [this message]
2018-09-12 14:55 ` [PATCH 0/4] MdeModulePkg: add support for dispatching foreign arch PE/COFF images Gao, Liming
2018-09-12 14:56 ` Ard Biesheuvel
2018-09-12 15:07 ` Carsey, Jaben
2018-09-12 15:11 ` Ard Biesheuvel
2018-09-12 15:10 ` Kinney, Michael D
2018-09-13 10:36 ` Ard Biesheuvel
2018-09-13 17:20 ` Kinney, Michael D
2018-09-15 13:28 ` Ard Biesheuvel
2018-09-17 4:03 ` Kinney, Michael D
2018-09-19 19:35 ` Andrew Fish
2018-09-19 20:43 ` Ard Biesheuvel
2018-09-21 18:51 ` Andrew Fish
2018-09-12 15:48 ` Carsey, Jaben
2018-09-12 18:50 ` Zimmer, Vincent
2018-09-13 0:47 ` Shi, Steven
2018-09-13 5:18 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180912132151.4258-5-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox