From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.15658.1605139916477214314 for ; Wed, 11 Nov 2020 16:11:56 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: maurice.ma@intel.com) IronPort-SDR: SlGuC4TsUYBaG2CNxuEzicyBium8hQpPGEzEgrIENvdfUkirf6HGN/dwjoEDd21bnjNbiguJc2 Km3Y17TRI1kA== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="169452046" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="169452046" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 16:11:50 -0800 IronPort-SDR: 9QHrcORED5J2mnz3me3c2qbafK6CcpW1uaSvSlyZdEn2GHLSYR21mykS2vCNm+9izmdcnjtyXw aDbxRjNkiQXQ== X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="356856604" Received: from mxma-mobl1.amr.corp.intel.com ([10.209.147.9]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 16:11:49 -0800 From: "Ma, Maurice" To: devel@edk2.groups.io Cc: Maurice Ma , Chasel Chiu , Nate DeSimone , Star Zeng Subject: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Date: Wed, 11 Nov 2020 16:10:32 -0800 Message-Id: <6799c7ce4aff0db1d5d0c6afe2901fb10bc939a9.1605139779.git.maurice.ma@intel.com> X-Mailer: git-send-email 2.29.2.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Cc: Chasel Chiu Cc: Nate DeSimone Cc: Star Zeng --- IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py b/IntelFsp2Pkg/Tools/SplitFs= pBin.py index 3c0d5af1b6..24272e82af 100644 --- a/IntelFsp2Pkg/Tools/SplitFspBin.py +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py @@ -677,8 +677,12 @@ class PeTeImage: else:=0D offset =3D self.Offset + self.DosHdr.e_lfanew=0D offset +=3D EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset=0D - offset +=3D EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset=0D - size =3D EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size=0D + if self.PeHdr.OptionalHeader.PePlusOptHdr.Magic =3D=3D 0x20b: = # PE32+ image=0D + offset +=3D EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.off= set=0D + size =3D EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.siz= e=0D + else:=0D + offset +=3D EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset=0D + size =3D EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size=0D =0D value =3D Bytes2Val(fdbin[offset:offset+size]) + delta=0D fdbin[offset:offset+size] =3D Val2Bytes(value, size)=0D --=20 2.29.2.windows.1