[PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
@ 2020-11-12  0:10 Ma, Maurice
  2020-11-12  0:37 ` Chiu, Chasel
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Ma, Maurice @ 2020-11-12  0:10 UTC (permalink / raw)
  To: devel; +Cc: Maurice Ma, Chasel Chiu, Nate DeSimone, Star Zeng

Current FSP rebasing script SplitFspBin.py has support for both
PE32 and PE32+ image formats. However, while updating the ImageBase
field in the image header, it always assumed the ImageBase field is
32bit long. Since PE32+ image format defined ImageBase as 64bit,
the current script will only update the lower 32bit value and leave
the upper 32bit untouched. It does not work well for PE32+ image
that requires update in the upper 32bit ImageBase field. The
expected behavior is to update the full 64bit field. This patch
implemented this fix.

Signed-off-by: Maurice Ma <maurice.ma@intel.com>

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
---
 IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py b/IntelFsp2Pkg/Tools/SplitFspBin.py
index 3c0d5af1b6..24272e82af 100644
--- a/IntelFsp2Pkg/Tools/SplitFspBin.py
+++ b/IntelFsp2Pkg/Tools/SplitFspBin.py
@@ -677,8 +677,12 @@ class PeTeImage:
         else:
             offset  = self.Offset + self.DosHdr.e_lfanew
             offset += EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset
-            offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset
-            size    = EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size
+            if self.PeHdr.OptionalHeader.PePlusOptHdr.Magic == 0x20b: # PE32+ image
+                offset += EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset
+                size    = EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size
+            else:
+                offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset
+                size    = EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size
 
         value  = Bytes2Val(fdbin[offset:offset+size]) + delta
         fdbin[offset:offset+size] = Val2Bytes(value, size)
-- 
2.29.2.windows.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
  2020-11-12  0:10 [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Ma, Maurice
@ 2020-11-12  0:37 ` Chiu, Chasel
  2020-11-12  4:12 ` Zeng, Star
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Chiu, Chasel @ 2020-11-12  0:37 UTC (permalink / raw)
  To: Ma, Maurice, devel@edk2.groups.io
  Cc: Ma, Maurice, Desimone, Nathaniel L, Zeng, Star


Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

> -----Original Message-----
> From: Maurice Ma <maurice.ma@intel.com>
> Sent: Thursday, November 12, 2020 8:11 AM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
> 
> Current FSP rebasing script SplitFspBin.py has support for both
> PE32 and PE32+ image formats. However, while updating the ImageBase field in
> the image header, it always assumed the ImageBase field is 32bit long. Since
> PE32+ image format defined ImageBase as 64bit, the current script will only
> update the lower 32bit value and leave the upper 32bit untouched. It does not
> work well for PE32+ image that requires update in the upper 32bit ImageBase
> field. The expected behavior is to update the full 64bit field. This patch
> implemented this fix.
> 
> Signed-off-by: Maurice Ma <maurice.ma@intel.com>
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> ---
>  IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py
> b/IntelFsp2Pkg/Tools/SplitFspBin.py
> index 3c0d5af1b6..24272e82af 100644
> --- a/IntelFsp2Pkg/Tools/SplitFspBin.py
> +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py
> @@ -677,8 +677,12 @@ class PeTeImage:
>          else:             offset  = self.Offset + self.DosHdr.e_lfanew             offset +=
> EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset-            offset +=
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset-            size    =
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size+            if
> self.PeHdr.OptionalHeader.PePlusOptHdr.Magic == 0x20b: # PE32+ image+
> offset += EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset+
> size    = EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size+            else:+
> offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset+                size    =
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size          value  =
> Bytes2Val(fdbin[offset:offset+size]) + delta         fdbin[offset:offset+size] =
> Val2Bytes(value, size)--
> 2.29.2.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
  2020-11-12  0:10 [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Ma, Maurice
  2020-11-12  0:37 ` Chiu, Chasel
@ 2020-11-12  4:12 ` Zeng, Star
  2020-11-14 23:52 ` Nate DeSimone
  2020-11-15  0:18 ` Nate DeSimone
  3 siblings, 0 replies; 5+ messages in thread
From: Zeng, Star @ 2020-11-12  4:12 UTC (permalink / raw)
  To: Ma, Maurice, devel@edk2.groups.io
  Cc: Ma, Maurice, Chiu, Chasel, Desimone, Nathaniel L

Reviewed-by: Star Zeng <star.zeng@intel.com>

-----Original Message-----
From: Maurice Ma <maurice.ma@intel.com> 
Sent: Thursday, November 12, 2020 8:11 AM
To: devel@edk2.groups.io
Cc: Ma, Maurice <maurice.ma@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image

Current FSP rebasing script SplitFspBin.py has support for both
PE32 and PE32+ image formats. However, while updating the ImageBase field in the image header, it always assumed the ImageBase field is 32bit long. Since PE32+ image format defined ImageBase as 64bit, the current script will only update the lower 32bit value and leave the upper 32bit untouched. It does not work well for PE32+ image that requires update in the upper 32bit ImageBase field. The expected behavior is to update the full 64bit field. This patch implemented this fix.

Signed-off-by: Maurice Ma <maurice.ma@intel.com>

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
---
 IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py b/IntelFsp2Pkg/Tools/SplitFspBin.py
index 3c0d5af1b6..24272e82af 100644
--- a/IntelFsp2Pkg/Tools/SplitFspBin.py
+++ b/IntelFsp2Pkg/Tools/SplitFspBin.py
@@ -677,8 +677,12 @@ class PeTeImage:
         else:

             offset  = self.Offset + self.DosHdr.e_lfanew

             offset += EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset

-            offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset

-            size    = EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size

+            if self.PeHdr.OptionalHeader.PePlusOptHdr.Magic == 0x20b: # 
+ PE32+ image

+                offset += 
+ EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset

+                size    = EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size

+            else:

+                offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset

+                size    = EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size

 

         value  = Bytes2Val(fdbin[offset:offset+size]) + delta

         fdbin[offset:offset+size] = Val2Bytes(value, size)

--
2.29.2.windows.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
  2020-11-12  0:10 [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Ma, Maurice
  2020-11-12  0:37 ` Chiu, Chasel
  2020-11-12  4:12 ` Zeng, Star
@ 2020-11-14 23:52 ` Nate DeSimone
  2020-11-15  0:18 ` Nate DeSimone
  3 siblings, 0 replies; 5+ messages in thread
From: Nate DeSimone @ 2020-11-14 23:52 UTC (permalink / raw)
  To: Ma, Maurice, devel@edk2.groups.io; +Cc: Ma, Maurice, Chiu, Chasel, Zeng, Star

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: Maurice Ma <maurice.ma@intel.com>
> Sent: Wednesday, November 11, 2020 4:11 PM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
> 
> Current FSP rebasing script SplitFspBin.py has support for both
> PE32 and PE32+ image formats. However, while updating the ImageBase field
> in the image header, it always assumed the ImageBase field is 32bit long.
> Since PE32+ image format defined ImageBase as 64bit, the current script will
> only update the lower 32bit value and leave the upper 32bit untouched. It
> does not work well for PE32+ image that requires update in the upper 32bit
> ImageBase field. The expected behavior is to update the full 64bit field. This
> patch implemented this fix.
> 
> Signed-off-by: Maurice Ma <maurice.ma@intel.com>
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> ---
>  IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py
> b/IntelFsp2Pkg/Tools/SplitFspBin.py
> index 3c0d5af1b6..24272e82af 100644
> --- a/IntelFsp2Pkg/Tools/SplitFspBin.py
> +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py
> @@ -677,8 +677,12 @@ class PeTeImage:
>          else:             offset  = self.Offset + self.DosHdr.e_lfanew             offset +=
> EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset-            offset +=
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset-            size    =
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size+            if
> self.PeHdr.OptionalHeader.PePlusOptHdr.Magic == 0x20b: # PE32+ image+
> offset += EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset+
> size    = EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size+
> else:+                offset +=
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset+                size    =
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size          value  =
> Bytes2Val(fdbin[offset:offset+size]) + delta         fdbin[offset:offset+size] =
> Val2Bytes(value, size)--
> 2.29.2.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
  2020-11-12  0:10 [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Ma, Maurice
                   ` (2 preceding siblings ...)
  2020-11-14 23:52 ` Nate DeSimone
@ 2020-11-15  0:18 ` Nate DeSimone
  3 siblings, 0 replies; 5+ messages in thread
From: Nate DeSimone @ 2020-11-15  0:18 UTC (permalink / raw)
  To: Ma, Maurice, devel@edk2.groups.io; +Cc: Ma, Maurice, Chiu, Chasel, Zeng, Star

Pushed: https://github.com/tianocore/edk2/commit/d448574

> -----Original Message-----
> From: Maurice Ma <maurice.ma@intel.com>
> Sent: Wednesday, November 11, 2020 4:11 PM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image
> 
> Current FSP rebasing script SplitFspBin.py has support for both
> PE32 and PE32+ image formats. However, while updating the ImageBase field
> in the image header, it always assumed the ImageBase field is 32bit long.
> Since PE32+ image format defined ImageBase as 64bit, the current script will
> only update the lower 32bit value and leave the upper 32bit untouched. It
> does not work well for PE32+ image that requires update in the upper 32bit
> ImageBase field. The expected behavior is to update the full 64bit field. This
> patch implemented this fix.
> 
> Signed-off-by: Maurice Ma <maurice.ma@intel.com>
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> ---
>  IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py
> b/IntelFsp2Pkg/Tools/SplitFspBin.py
> index 3c0d5af1b6..24272e82af 100644
> --- a/IntelFsp2Pkg/Tools/SplitFspBin.py
> +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py
> @@ -677,8 +677,12 @@ class PeTeImage:
>          else:             offset  = self.Offset + self.DosHdr.e_lfanew             offset +=
> EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset-            offset +=
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset-            size    =
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size+            if
> self.PeHdr.OptionalHeader.PePlusOptHdr.Magic == 0x20b: # PE32+ image+
> offset += EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset+
> size    = EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size+
> else:+                offset +=
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset+                size    =
> EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size          value  =
> Bytes2Val(fdbin[offset:offset+size]) + delta         fdbin[offset:offset+size] =
> Val2Bytes(value, size)--
> 2.29.2.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-11-15  0:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-12  0:10 [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Ma, Maurice
2020-11-12  0:37 ` Chiu, Chasel
2020-11-12  4:12 ` Zeng, Star
2020-11-14 23:52 ` Nate DeSimone
2020-11-15  0:18 ` Nate DeSimone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox