public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
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 3/4] SecurityPkg: remove PE/COFF header workaround for ELILO on IPF
Date: Thu, 6 Sep 2018 18:47:18 +0200	[thread overview]
Message-ID: <22163ca3-78c7-3bbe-2fb8-453f847ed69f@redhat.com> (raw)
In-Reply-To: <20180906134523.2036-4-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>
> ---
>  SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c        | 47 ++++----------------
>  SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c              | 27 +++--------
>  SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c                                  | 27 +++--------
>  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c | 25 +++--------
>  4 files changed, 25 insertions(+), 101 deletions(-)
> 
> diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> index 0f795c0af125..66d96a9396b9 100644
> --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> @@ -295,7 +295,6 @@ HashPeImage (
>    )
>  {
>    BOOLEAN                   Status;
> -  UINT16                    Magic;
>    EFI_IMAGE_SECTION_HEADER  *Section;
>    VOID                      *HashCtx;
>    UINTN                     CtxSize;
> @@ -367,33 +366,19 @@ HashPeImage (
>    // Measuring PE/COFF Image Header;
>    // But CheckSum field and SECURITY data directory (certificate) are excluded
>    //
> -  if (mNtHeader.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> -    //
> -    // 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 magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
> -    //
> -    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
> -  } else {
> -    //
> -    // Get the magic value from the PE/COFF Optional Header
> -    //
> -    Magic =  mNtHeader.Pe32->OptionalHeader.Magic;
> -  }
>  
>    //
>    // 3.  Calculate the distance from the base of the image header to the image checksum address.
>    // 4.  Hash the image header from its base to beginning of the image checksum.
>    //
>    HashBase = mImageBase;
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset.
>      //
>      HashSize = (UINTN) (&mNtHeader.Pe32->OptionalHeader.CheckSum) - (UINTN) HashBase;
>      NumberOfRvaAndSizes = mNtHeader.Pe32->OptionalHeader.NumberOfRvaAndSizes;
> -  } else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
> +  } else if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
>      //
>      // Use PE32+ offset.
>      //
> @@ -420,7 +405,7 @@ HashPeImage (
>      // 6.  Since there is no Cert Directory in optional header, hash everything
>      //     from the end of the checksum to the end of image header.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset.
>        //
> @@ -444,7 +429,7 @@ HashPeImage (
>      //
>      // 7.  Hash everything from the end of the checksum to the start of the Cert Directory.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset.
>        //
> @@ -469,7 +454,7 @@ HashPeImage (
>      // 8.  Skip over the Cert Directory. (It is sizeof(IMAGE_DATA_DIRECTORY) bytes.)
>      // 9.  Hash everything from the end of the Cert Directory to the end of image header.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset
>        //
> @@ -494,7 +479,7 @@ HashPeImage (
>    //
>    // 10. Set the SUM_OF_BYTES_HASHED to the size of the header.
>    //
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset.
>      //
> @@ -577,7 +562,7 @@ HashPeImage (
>      if (NumberOfRvaAndSizes <= EFI_IMAGE_DIRECTORY_ENTRY_SECURITY) {
>        CertSize = 0;
>      } else {
> -      if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +      if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>          //
>          // Use PE32 offset.
>          //
> @@ -1583,7 +1568,6 @@ DxeImageVerificationHandler (
>    )
>  {
>    EFI_STATUS                           Status;
> -  UINT16                               Magic;
>    EFI_IMAGE_DOS_HEADER                 *DosHdr;
>    EFI_STATUS                           VerifyStatus;
>    EFI_SIGNATURE_LIST                   *SignatureList;
> @@ -1723,22 +1707,7 @@ DxeImageVerificationHandler (
>      goto Done;
>    }
>  
> -  if (mNtHeader.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> -    //
> -    // 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 magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
> -    //
> -    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
> -  } else {
> -    //
> -    // Get the magic value from the PE/COFF Optional Header
> -    //
> -    Magic = mNtHeader.Pe32->OptionalHeader.Magic;
> -  }
> -
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset.
>      //
> diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
> index c54ab62e2745..4e4a90f9da62 100644
> --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
> +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
> @@ -320,7 +320,6 @@ TcgMeasurePeImage (
>    EFI_IMAGE_SECTION_HEADER             *SectionHeader;
>    UINTN                                Index;
>    UINTN                                Pos;
> -  UINT16                               Magic;
>    UINT32                               EventSize;
>    UINT32                               EventNumber;
>    EFI_PHYSICAL_ADDRESS                 EventLogLastEntry;
> @@ -418,27 +417,13 @@ TcgMeasurePeImage (
>    // Measuring PE/COFF Image Header;
>    // But CheckSum field and SECURITY data directory (certificate) are excluded
>    //
> -  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> -    //
> -    // 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 magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
> -    //
> -    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
> -  } else {
> -    //
> -    // Get the magic value from the PE/COFF Optional Header
> -    //
> -    Magic = Hdr.Pe32->OptionalHeader.Magic;
> -  }
>  
>    //
>    // 3.  Calculate the distance from the base of the image header to the image checksum address.
>    // 4.  Hash the image header from its base to beginning of the image checksum.
>    //
>    HashBase = (UINT8 *) (UINTN) ImageAddress;
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset
>      //
> @@ -465,7 +450,7 @@ TcgMeasurePeImage (
>      // 6.  Since there is no Cert Directory in optional header, hash everything
>      //     from the end of the checksum to the end of image header.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset.
>        //
> @@ -489,7 +474,7 @@ TcgMeasurePeImage (
>      //
>      // 7.  Hash everything from the end of the checksum to the start of the Cert Directory.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset
>        //
> @@ -514,7 +499,7 @@ TcgMeasurePeImage (
>      // 8.  Skip over the Cert Directory. (It is sizeof(IMAGE_DATA_DIRECTORY) bytes.)
>      // 9.  Hash everything from the end of the Cert Directory to the end of image header.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset
>        //
> @@ -539,7 +524,7 @@ TcgMeasurePeImage (
>    //
>    // 10. Set the SUM_OF_BYTES_HASHED to the size of the header
>    //
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset
>      //
> @@ -621,7 +606,7 @@ TcgMeasurePeImage (
>      if (NumberOfRvaAndSizes <= EFI_IMAGE_DIRECTORY_ENTRY_SECURITY) {
>        CertSize = 0;
>      } else {
> -      if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +      if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>          //
>          // Use PE32 offset.
>          //
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
> index 29da2d70e699..61195e6041f7 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
> @@ -116,7 +116,6 @@ MeasurePeImageAndExtend (
>    EFI_IMAGE_SECTION_HEADER             *SectionHeader;
>    UINTN                                Index;
>    UINTN                                Pos;
> -  UINT16                               Magic;
>    EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr;
>    UINT32                               NumberOfRvaAndSizes;
>    UINT32                               CertSize;
> @@ -181,27 +180,13 @@ MeasurePeImageAndExtend (
>    // Measuring PE/COFF Image Header;
>    // But CheckSum field and SECURITY data directory (certificate) are excluded
>    //
> -  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> -    //
> -    // 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 magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
> -    //
> -    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
> -  } else {
> -    //
> -    // Get the magic value from the PE/COFF Optional Header
> -    //
> -    Magic = Hdr.Pe32->OptionalHeader.Magic;
> -  }
>  
>    //
>    // 3.  Calculate the distance from the base of the image header to the image checksum address.
>    // 4.  Hash the image header from its base to beginning of the image checksum.
>    //
>    HashBase = (UINT8 *) (UINTN) ImageAddress;
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

I think this is a bug. Here "Magic" used to be set based on "Hdr.Pe32->OptionalHeader.Magic", not based on "mNtHeader.Pe32->OptionalHeader.Magic".

And, I'm not convinced (mNtHeader.Pe32 == Hdr.Pe32). In earlier parts of this function, "Hdr.Pe32" is set as follows:

  Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINT8 *) (UINTN) ImageAddress + PeCoffHeaderOffset);

where "ImageAddress" is an input parameter to the function.

I wonder why this code compiles; no "mNtHeader" declaration should be in scope here.

$ git grep -w -l mNtHeader

SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c

More of the same below:

>      //
>      // Use PE32 offset
>      //
> @@ -228,7 +213,7 @@ MeasurePeImageAndExtend (
>      // 6.  Since there is no Cert Directory in optional header, hash everything
>      //     from the end of the checksum to the end of image header.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset.
>        //
> @@ -252,7 +237,7 @@ MeasurePeImageAndExtend (
>      //
>      // 7.  Hash everything from the end of the checksum to the start of the Cert Directory.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset
>        //
> @@ -277,7 +262,7 @@ MeasurePeImageAndExtend (
>      // 8.  Skip over the Cert Directory. (It is sizeof(IMAGE_DATA_DIRECTORY) bytes.)
>      // 9.  Hash everything from the end of the Cert Directory to the end of image header.
>      //
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset
>        //
> @@ -302,7 +287,7 @@ MeasurePeImageAndExtend (
>    //
>    // 10. Set the SUM_OF_BYTES_HASHED to the size of the header
>    //
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset
>      //
> @@ -384,7 +369,7 @@ MeasurePeImageAndExtend (
>      if (NumberOfRvaAndSizes <= EFI_IMAGE_DIRECTORY_ENTRY_SECURITY) {
>        CertSize = 0;
>      } else {
> -      if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +      if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>          //
>          // Use PE32 offset.
>          //

Until here.

For build-testing, I suggest

  build -p SecurityPkg/SecurityPkg.dsc ...

It will build all SecurityPkg modules, without putting them in a flash device (FD).

The rest looks good to me.

Thanks,
Laszlo

> diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
> index 9acaa7b97507..f96325e978a5 100644
> --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
> +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
> @@ -1831,7 +1831,6 @@ HashPeImage (
>    )
>  {
>    BOOLEAN                   Status;
> -  UINT16                    Magic;
>    EFI_IMAGE_SECTION_HEADER  *Section;
>    VOID                      *HashCtx;
>    UINTN                     CtxSize;
> @@ -1874,27 +1873,13 @@ HashPeImage (
>    // Measuring PE/COFF Image Header;
>    // But CheckSum field and SECURITY data directory (certificate) are excluded
>    //
> -  if (mNtHeader.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> -    //
> -    // 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 magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
> -    //
> -    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
> -  } else {
> -    //
> -    // Get the magic value from the PE/COFF Optional Header
> -    //
> -    Magic = mNtHeader.Pe32->OptionalHeader.Magic;
> -  }
>  
>    //
>    // 3.  Calculate the distance from the base of the image header to the image checksum address.
>    // 4.  Hash the image header from its base to beginning of the image checksum.
>    //
>    HashBase = mImageBase;
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset.
>      //
> @@ -1915,7 +1900,7 @@ HashPeImage (
>    // 6.  Get the address of the beginning of the Cert Directory.
>    // 7.  Hash everything from the end of the checksum to the start of the Cert Directory.
>    //
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset.
>      //
> @@ -1937,7 +1922,7 @@ HashPeImage (
>    // 8.  Skip over the Cert Directory. (It is sizeof(IMAGE_DATA_DIRECTORY) bytes.)
>    // 9.  Hash everything from the end of the Cert Directory to the end of image header.
>    //
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset
>      //
> @@ -1958,7 +1943,7 @@ HashPeImage (
>    //
>    // 10. Set the SUM_OF_BYTES_HASHED to the size of the header.
>    //
> -  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +  if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>      //
>      // Use PE32 offset.
>      //
> @@ -2032,7 +2017,7 @@ HashPeImage (
>    //
>    if (mImageSize > SumOfBytesHashed) {
>      HashBase = mImageBase + SumOfBytesHashed;
> -    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> +    if (mNtHeader.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>        //
>        // Use PE32 offset.
>        //
> 



  reply	other threads:[~2018-09-06 16:47 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
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 [this message]
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=22163ca3-78c7-3bbe-2fb8-453f847ed69f@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