From: Laszlo Ersek <lersek@redhat.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>, edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Star Zeng <star.zeng@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Chao Zhang <chao.b.zhang@intel.com>
Subject: Re: [PATCH 2/4] MdePkg/BasePeCoffLib: remove PE/COFF header workaround for ELILO on IPF
Date: Thu, 6 Sep 2018 18:31:03 +0200 [thread overview]
Message-ID: <3494cba6-535d-d805-b3bf-98fda743a59d@redhat.com> (raw)
In-Reply-To: <20180906134523.2036-3-ard.biesheuvel@linaro.org>
On 09/06/18 15:45, Ard Biesheuvel wrote:
> Now that Itanium support has been dropped, we can remove the various
> occurrences of the ELILO on Itanium PE/COFF header workaround.
>
> Link: https://bugzilla.tianocore.org/show_bug.cgi?id=816
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 61 +++-----------------
> 1 file changed, 9 insertions(+), 52 deletions(-)
>
> diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> index 32eca0ad2ef4..c57816a80887 100644
> --- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> +++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> @@ -46,36 +46,6 @@ PeCoffLoaderAdjustOffsetForTeImage (
> SectionHeader->PointerToRawData -= TeStrippedOffset;
> }
>
> -/**
> - Retrieves the magic value from the PE/COFF header.
> -
> - @param Hdr The buffer in which to return the PE32, PE32+, or TE header.
> -
> - @return EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC - Image is PE32
> - @return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC - Image is PE32+
> -
> -**/
> -UINT16
> -PeCoffLoaderGetPeHeaderMagicValue (
> - IN EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr
> - )
> -{
> - //
> - // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value
> - // in the PE/COFF Header. If the MachineType is Itanium(IA64) and the
> - // Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC
> - // then override the returned value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
> - //
> - if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> - return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
> - }
> - //
> - // Return the magic value from the PC/COFF Optional Header
> - //
> - return Hdr.Pe32->OptionalHeader.Magic;
> -}
> -
> -
> /**
> Retrieves the PE or TE Header from a PE/COFF or TE image.
>
> @@ -101,7 +71,6 @@ PeCoffLoaderGetPeHeader (
> EFI_IMAGE_DOS_HEADER DosHdr;
> UINTN Size;
> UINTN ReadSize;
> - UINT16 Magic;
> UINT32 SectionHeaderOffset;
> UINT32 Index;
> UINT32 HeaderWithoutDataDir;
> @@ -222,9 +191,7 @@ PeCoffLoaderGetPeHeader (
> ImageContext->IsTeImage = FALSE;
> ImageContext->Machine = Hdr.Pe32->FileHeader.Machine;
>
> - Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr);
> -
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // 1. Check OptionalHeader.NumberOfRvaAndSizes filed.
> //
> @@ -339,7 +306,7 @@ PeCoffLoaderGetPeHeader (
> ImageContext->SectionAlignment = Hdr.Pe32->OptionalHeader.SectionAlignment;
> ImageContext->SizeOfHeaders = Hdr.Pe32->OptionalHeader.SizeOfHeaders;
>
> - } else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
> + } else if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
> //
> // 1. Check FileHeader.NumberOfRvaAndSizes filed.
> //
> @@ -605,7 +572,6 @@ PeCoffLoaderGetImageInfo (
> EFI_IMAGE_SECTION_HEADER SectionHeader;
> EFI_IMAGE_DEBUG_DIRECTORY_ENTRY DebugEntry;
> UINT32 NumberOfRvaAndSizes;
> - UINT16 Magic;
> UINT32 TeStrippedOffset;
>
> if (ImageContext == NULL) {
> @@ -622,14 +588,12 @@ PeCoffLoaderGetImageInfo (
> return Status;
> }
>
> - Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr);
> -
> //
> // Retrieve the base address of the image
> //
> if (!(ImageContext->IsTeImage)) {
> TeStrippedOffset = 0;
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
> @@ -678,7 +642,7 @@ PeCoffLoaderGetImageInfo (
> }
>
> if (!(ImageContext->IsTeImage)) {
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
> @@ -952,7 +916,6 @@ PeCoffLoaderRelocateImage (
> CHAR8 *FixupData;
> PHYSICAL_ADDRESS BaseAddress;
> UINT32 NumberOfRvaAndSizes;
> - UINT16 Magic;
> UINT32 TeStrippedOffset;
>
> ASSERT (ImageContext != NULL);
> @@ -985,9 +948,8 @@ PeCoffLoaderRelocateImage (
> if (!(ImageContext->IsTeImage)) {
> Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)ImageContext->ImageAddress + ImageContext->PeCoffHeaderOffset);
> TeStrippedOffset = 0;
> - Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr);
>
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
> @@ -1230,7 +1192,6 @@ PeCoffLoaderLoadImage (
> UINTN Size;
> UINT32 TempDebugEntryRva;
> UINT32 NumberOfRvaAndSizes;
> - UINT16 Magic;
> EFI_IMAGE_RESOURCE_DIRECTORY *ResourceDirectory;
> EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY *ResourceDirectoryEntry;
> EFI_IMAGE_RESOURCE_DIRECTORY_STRING *ResourceDirectoryString;
> @@ -1404,12 +1365,11 @@ PeCoffLoaderLoadImage (
> //
> // Get image's entry point
> //
> - Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr);
> if (!(ImageContext->IsTeImage)) {
> //
> // Sizes of AddressOfEntryPoint are different so we need to do this safely
> //
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
> @@ -1444,7 +1404,7 @@ PeCoffLoaderLoadImage (
> // the optional header to verify a desired directory entry is there.
> //
> if (!(ImageContext->IsTeImage)) {
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
> @@ -1565,7 +1525,7 @@ PeCoffLoaderLoadImage (
> //
> ImageContext->HiiResourceData = 0;
> if (!(ImageContext->IsTeImage)) {
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
> @@ -1721,7 +1681,6 @@ PeCoffLoaderRelocateImageForRuntime (
> CHAR8 *FixupData;
> UINTN Adjust;
> RETURN_STATUS Status;
> - UINT16 Magic;
>
> OldBase = (CHAR8 *)((UINTN)ImageBase);
> NewBase = (CHAR8 *)((UINTN)VirtImageBase);
> @@ -1750,9 +1709,7 @@ PeCoffLoaderRelocateImageForRuntime (
> return ;
> }
>
> - Magic = PeCoffLoaderGetPeHeaderMagicValue (Hdr);
> -
> - if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> //
> // Use PE32 offset
> //
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
next prev parent reply other threads:[~2018-09-06 16:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 13:45 [PATCH 0/4] remove all 11 occurrences of ELILO on IPF PE/COFF header hack Ard Biesheuvel
2018-09-06 13:45 ` [PATCH 1/4] MdeModulePkg: remove PE/COFF header workaround for ELILO on IPF Ard Biesheuvel
2018-09-06 16:29 ` Laszlo Ersek
2018-09-07 5:15 ` Zeng, Star
2018-09-06 13:45 ` [PATCH 2/4] MdePkg/BasePeCoffLib: " Ard Biesheuvel
2018-09-06 16:31 ` Laszlo Ersek [this message]
2018-09-07 5:15 ` Zeng, Star
2018-09-07 5:36 ` Gao, Liming
2018-09-06 13:45 ` [PATCH 3/4] SecurityPkg: " Ard Biesheuvel
2018-09-06 16:47 ` Laszlo Ersek
2018-09-06 17:25 ` Ard Biesheuvel
2018-09-06 18:22 ` Laszlo Ersek
2018-09-06 13:45 ` [PATCH 4/4] EdkCompatibilityPkg: " Ard Biesheuvel
2018-09-06 16:53 ` Laszlo Ersek
2018-09-06 17:27 ` Ard Biesheuvel
2018-09-06 18:01 ` Carsey, Jaben
2018-09-06 18:15 ` Laszlo Ersek
2018-09-06 14:05 ` [PATCH 0/4] remove all 11 occurrences of ELILO on IPF PE/COFF header hack Yao, Jiewen
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=3494cba6-535d-d805-b3bf-98fda743a59d@redhat.com \
--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