public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] BaseTools/PeCoffLib: Check 'RelocDir' before finding the relocation block
@ 2016-11-09  5:18 Hao Wu
  2016-11-09  5:21 ` Gao, Liming
  0 siblings, 1 reply; 2+ messages in thread
From: Hao Wu @ 2016-11-09  5:18 UTC (permalink / raw)
  To: edk2-devel; +Cc: Hao Wu, Liming Gao, Yonghong Zhu

To match the code logics in MdePkg/Library/BasePeCoffLib, add checks for
'RelocDir' before finding the relocation block.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 BaseTools/Source/C/Common/BasePeCoff.c | 46 ++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/BaseTools/Source/C/Common/BasePeCoff.c b/BaseTools/Source/C/Common/BasePeCoff.c
index 9adbdfa..692663d 100644
--- a/BaseTools/Source/C/Common/BasePeCoff.c
+++ b/BaseTools/Source/C/Common/BasePeCoff.c
@@ -645,14 +645,21 @@ Returns:
       //
       if (OptionHeader.Optional32->NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
         RelocDir  = &OptionHeader.Optional32->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
-        RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
-        RelocBaseEnd = PeCoffLoaderImageAddress (
-                        ImageContext,
-                        RelocDir->VirtualAddress + RelocDir->Size - 1
-                        );
-        if (RelocBase == NULL || RelocBaseEnd == NULL || RelocBaseEnd < RelocBase) {
-          ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
-          return RETURN_LOAD_ERROR;
+        if ((RelocDir != NULL) && (RelocDir->Size > 0)) {
+          RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
+          RelocBaseEnd = PeCoffLoaderImageAddress (
+                           ImageContext,
+                           RelocDir->VirtualAddress + RelocDir->Size - 1
+                           );
+          if (RelocBase == NULL || RelocBaseEnd == NULL || RelocBaseEnd < RelocBase) {
+            ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
+            return RETURN_LOAD_ERROR;
+          }
+        } else {
+          //
+          // Set base and end to bypass processing below.
+          //
+          RelocBase = RelocBaseEnd = 0;
         }
       } else {
         //
@@ -673,14 +680,21 @@ Returns:
       //
       if (OptionHeader.Optional64->NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
         RelocDir  = &OptionHeader.Optional64->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
-        RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
-        RelocBaseEnd = PeCoffLoaderImageAddress (
-                        ImageContext,
-                        RelocDir->VirtualAddress + RelocDir->Size - 1
-                        );
-        if (RelocBase == NULL || RelocBaseEnd == NULL || RelocBaseEnd < RelocBase) {
-          ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
-          return RETURN_LOAD_ERROR;
+        if ((RelocDir != NULL) && (RelocDir->Size > 0)) {
+          RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
+          RelocBaseEnd = PeCoffLoaderImageAddress (
+                           ImageContext,
+                           RelocDir->VirtualAddress + RelocDir->Size - 1
+                          );
+          if (RelocBase == NULL || RelocBaseEnd == NULL || RelocBaseEnd < RelocBase) {
+            ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
+            return RETURN_LOAD_ERROR;
+          }
+        } else {
+          //
+          // Set base and end to bypass processing below.
+          //
+          RelocBase = RelocBaseEnd = 0;
         }
       } else {
         //
-- 
1.9.5.msysgit.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-11-09  5:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-09  5:18 [PATCH] BaseTools/PeCoffLib: Check 'RelocDir' before finding the relocation block Hao Wu
2016-11-09  5:21 ` Gao, Liming

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox