MdePkg: Improving readability of CVE patch for PeCoffLoaderRelocateImage

Flickdm · AmyChan-Intel · commit 15c43ddd50e9 · 2024-10-21T15:13:44.000+08:00
(cherry picked from commit e73ec56) This change adds parantheses to the if condition detecting overflow in the PeCoffLoaderRelocateImage function to improve readability. Follow on change for: REF!: tianocore#6249 Signed-off-by: Doug Flick <dougflick@microsoft.com> (cherry picked from commit e73ec56) Change-Id: Ifdeffbfc560731b409ef79f0021e7d9aac319569
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -1054,7 +1054,7 @@ PeCoffLoaderRelocateImage (
     RelocDir = &Hdr.Te->DataDirectory[0];
   }
 
-  if ((RelocDir != NULL) && (RelocDir->Size > 0) && (RelocDir->Size - 1 < MAX_UINT32 - RelocDir->VirtualAddress)) {
+  if ((RelocDir != NULL) && (RelocDir->Size > 0) && ((RelocDir->Size - 1) < (MAX_UINT32 - RelocDir->VirtualAddress))) {
     RelocBase    = (EFI_IMAGE_BASE_RELOCATION *)PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress, TeStrippedOffset);
     RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *)PeCoffLoaderImageAddress (
                                                   ImageContext,

Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ PeCoffLoaderRelocateImage (`
`1054`	`1054`	`RelocDir = &Hdr.Te->DataDirectory[0];`
`1055`	`1055`	`}`
`1056`	`1056`
`1057`		`- if ((RelocDir != NULL) && (RelocDir->Size > 0) && (RelocDir->Size - 1 < MAX_UINT32 - RelocDir->VirtualAddress)) {`
	`1057`	`+ if ((RelocDir != NULL) && (RelocDir->Size > 0) && ((RelocDir->Size - 1) < (MAX_UINT32 - RelocDir->VirtualAddress))) {`
`1058`	`1058`	`RelocBase = (EFI_IMAGE_BASE_RELOCATION *)PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress, TeStrippedOffset);`
`1059`	`1059`	`RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *)PeCoffLoaderImageAddress (`
`1060`	`1060`	`ImageContext,`