tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: do basic check in FvImage with header size and signature 

Add some basic check in FvImage with header size and signature.

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1181
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
zhijufan 2018-09-25 10:55:46 +08:00 committed by Yonghong Zhu
parent 55e8ff01af
commit 0e982cf03d
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
BaseTools/Source/Python/GenFds/Fv.py
View File

@ -195,32 +195,36 @@ class FV (FvClassObject):
# #
# Write the Fv contents to Buffer # Write the Fv contents to Buffer
# #
if os.path.isfile(FvOutputFile): if os.path.isfile(FvOutputFile) and os.path.getsize(FvOutputFile) >= 0x48:
FvFileObj = open(FvOutputFile, 'rb') FvFileObj = open(FvOutputFile, 'rb')
GenFdsGlobalVariable.VerboseLogger("\nGenerate %s FV Successfully" % self.UiFvName)
GenFdsGlobalVariable.SharpCounter = 0
Buffer.write(FvFileObj.read())
FvFileObj.seek(0)
# PI FvHeader is 0x48 byte # PI FvHeader is 0x48 byte
FvHeaderBuffer = FvFileObj.read(0x48) FvHeaderBuffer = FvFileObj.read(0x48)
# FV alignment position. Signature = FvHeaderBuffer[0x28:0x32]
FvAlignmentValue = 1 << (ord(FvHeaderBuffer[0x2E]) & 0x1F) if Signature and Signature.startswith('_FVH'):
if FvAlignmentValue >= 0x400: GenFdsGlobalVariable.VerboseLogger("\nGenerate %s FV Successfully" % self.UiFvName)
if FvAlignmentValue >= 0x100000: GenFdsGlobalVariable.SharpCounter = 0
if FvAlignmentValue >= 0x1000000:
#The max alignment supported by FFS is 16M. Buffer.write(FvFileObj.read())
self.FvAlignment = "16M" FvFileObj.seek(0)
# FV alignment position.
FvAlignmentValue = 1 << (ord(FvHeaderBuffer[0x2E]) & 0x1F)
if FvAlignmentValue >= 0x400:
if FvAlignmentValue >= 0x100000:
if FvAlignmentValue >= 0x1000000:
#The max alignment supported by FFS is 16M.
self.FvAlignment = "16M"
else:
self.FvAlignment = str(FvAlignmentValue / 0x100000) + "M"
else: else:
self.FvAlignment = str(FvAlignmentValue / 0x100000) + "M" self.FvAlignment = str(FvAlignmentValue / 0x400) + "K"
else: else:
self.FvAlignment = str(FvAlignmentValue / 0x400) + "K" # FvAlignmentValue is less than 1K
self.FvAlignment = str (FvAlignmentValue)
FvFileObj.close()
GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile
GenFdsGlobalVariable.LargeFileInFvFlags.pop()
else: else:
# FvAlignmentValue is less than 1K GenFdsGlobalVariable.ErrorLogger("Invalid FV file %s." % self.UiFvName)
self.FvAlignment = str (FvAlignmentValue)
FvFileObj.close()
GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile
GenFdsGlobalVariable.LargeFileInFvFlags.pop()
else: else:
GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV file." %self.UiFvName) GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV file." %self.UiFvName)
return FvOutputFile return FvOutputFile