From 5fb01f8f29aaa16f0389c6f51ec954a7ee9750c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?=
 <8659494+mhaeuser@users.noreply.github.com>
Date: Tue, 13 Jun 2023 02:18:01 +0200
Subject: [PATCH] ImageTool: Enforce reloc disjointness

---
 BaseTools/ImageTool/Image.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/BaseTools/ImageTool/Image.c b/BaseTools/ImageTool/Image.c
index e803d0f87a..1c86b07104 100644
--- a/BaseTools/ImageTool/Image.c
+++ b/BaseTools/ImageTool/Image.c
@@ -166,11 +166,11 @@ static
 bool
 CheckToolImageReloc (
   const image_tool_image_info_t *Image,
-  const image_tool_reloc_t      *Reloc
+  const image_tool_reloc_t      *Reloc,
+  uint8_t                       RelocSize
   )
 {
   uint32_t                   RelocOffset;
-  uint8_t                    RelocSize;
   uint32_t                   RemainingSize;
   const image_tool_segment_t *Segment;
   uint16_t                   MovHigh;
@@ -187,12 +187,6 @@ CheckToolImageReloc (
     return false;
   }
 
-  RelocSize = ToolImageGetRelocSize (Reloc->Type);
-  if (RelocSize == 0) {
-    DEBUG_RAISE ();
-    return false;
-  }
-
   if (RelocSize > RemainingSize) {
     DEBUG_RAISE ();
     return false;
@@ -232,7 +226,8 @@ CheckToolImageRelocInfo (
   )
 {
   const image_tool_reloc_info_t *RelocInfo;
-  uint32_t                      PrevTarget;
+  uint8_t                       RelocSize;
+  uint32_t                      MinRelocTarget;
   uint32_t                      Index;
   bool                          Result;
 
@@ -252,21 +247,27 @@ CheckToolImageRelocInfo (
     return false;
   }
 
-  PrevTarget = 0;
+  MinRelocTarget = 0;
 
   for (Index = 0; Index < RelocInfo->NumRelocs; ++Index) {
-    if (RelocInfo->Relocs[Index].Target < PrevTarget) {
-      assert (false);
+    if (RelocInfo->Relocs[Index].Target < MinRelocTarget) {
+      DEBUG_RAISE ();
       return false;
     }
 
-    Result = CheckToolImageReloc (Image, ImageSize, &RelocInfo->Relocs[Index]);
+    RelocSize = ToolImageGetRelocSize (RelocInfo->Relocs[Index].Type);
+    if (RelocSize == 0) {
+      DEBUG_RAISE ();
+      return false;
+    }
+
+    Result = CheckToolImageReloc (Image, &RelocInfo->Relocs[Index], RelocSize);
     if (!Result) {
       DEBUG_RAISE ();
       return false;
     }
 
-    PrevTarget = RelocInfo->Relocs[Index].Target;
+    MinRelocTarget = RelocInfo->Relocs[Index].Target + RelocSize;
   }
 
   return true;