summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Flick <dougflick@microsoft.com>2024-09-27 12:08:55 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-09-30 18:12:30 +0000
commitc95233b8525ca6828921affd1496146cff262e65 (patch)
tree0fd66526b260546bd4b16185ca86fbb576b6e743
parent517019a55302b1222c152ee05226d55883050642 (diff)
downloadedk2-c95233b8525ca6828921affd1496146cff262e65.tar.gz
edk2-c95233b8525ca6828921affd1496146cff262e65.tar.bz2
edk2-c95233b8525ca6828921affd1496146cff262e65.zip
MdePkg: Fix overflow issue in BasePeCoffLib
The RelocDir->Size is a UINT32 value, and RelocDir->VirtualAddress is also a UINT32 value. The current code does not check for overflow when adding RelocDir->Size to RelocDir->VirtualAddress. This patch adds a check to ensure that the addition does not overflow. Signed-off-by: Doug Flick <dougflick@microsoft.com> Authored-by: sriraamx gobichettipalayam <sri..@intel.com>
-rw-r--r--MdePkg/Library/BasePeCoffLib/BasePeCoff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 86ff2e769b..128090d98e 100644
--- 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)) {
+ 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,