From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=hong-chihx.hsueh@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2274C211B76D0 for ; Mon, 28 Jan 2019 15:22:25 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jan 2019 15:22:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,535,1539673200"; d="scan'208";a="113420718" Received: from hhsuehx-desk.gar.corp.intel.com ([10.9.67.173]) by orsmga008.jf.intel.com with ESMTP; 28 Jan 2019 15:22:24 -0800 From: Neo Hsueh To: edk2-devel@lists.01.org Cc: Michael D Kinney , Liming Gao , Dandan Bi , Laszlo Ersek Date: Mon, 28 Jan 2019 15:22:00 -0800 Message-Id: <20190128232200.1968-1-hong-chihx.hsueh@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 Subject: [PATCH] MdePkg/BasePeCoffLib: skip runtime relocation if relocation info is invalid. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2019 23:22:26 -0000 Skip runtime relocation for PE images that provide invalid relocation infomation (ex: RelocDir->Size = 0) to fix a hang observed while booting Windows. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Neo Hsueh Cc: Michael D Kinney Cc: Liming Gao Cc: Dandan Bi Cc: Laszlo Ersek --- MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c index 1bd079ad6a..6d6c37bd61 100644 --- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c +++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c @@ -1002,7 +1002,7 @@ PeCoffLoaderRelocateImage ( RelocDir->VirtualAddress + RelocDir->Size - 1, TeStrippedOffset ); - if (RelocBase == NULL || RelocBaseEnd == NULL || RelocBaseEnd < RelocBase) { + if (RelocBase == NULL || RelocBaseEnd == NULL || (UINTN) RelocBaseEnd < (UINTN) RelocBase) { ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION; return RETURN_LOAD_ERROR; } @@ -1022,7 +1022,7 @@ PeCoffLoaderRelocateImage ( // Run the relocation information and apply the fixups // FixupData = ImageContext->FixupData; - while (RelocBase < RelocBaseEnd) { + while ((UINTN) RelocBase < (UINTN) RelocBaseEnd) { Reloc = (UINT16 *) ((CHAR8 *) RelocBase + sizeof (EFI_IMAGE_BASE_RELOCATION)); // @@ -1051,7 +1051,7 @@ PeCoffLoaderRelocateImage ( // // Run this relocation record // - while (Reloc < RelocEnd) { + while ((UINTN) Reloc < (UINTN) RelocEnd) { Fixup = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress + (*Reloc & 0xFFF), TeStrippedOffset); if (Fixup == NULL) { ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION; @@ -1746,6 +1746,12 @@ PeCoffLoaderRelocateImageForRuntime ( RelocDir->VirtualAddress + RelocDir->Size - 1, 0 ); + if (RelocBase == NULL || RelocBaseEnd == NULL || (UINTN) RelocBaseEnd < (UINTN) RelocBase) { + // + // relocation block is not valid, just return + // + return; + } } else { // // Cannot find relocations, cannot continue to relocate the image, ASSERT for this invalid image. @@ -1769,7 +1775,7 @@ PeCoffLoaderRelocateImageForRuntime ( // FixupData = RelocationData; RelocBaseOrig = RelocBase; - while (RelocBase < RelocBaseEnd) { + while ((UINTN) RelocBase < (UINTN) RelocBaseEnd) { // // Add check for RelocBase->SizeOfBlock field. // @@ -1794,7 +1800,7 @@ PeCoffLoaderRelocateImageForRuntime ( // // Run this relocation record // - while (Reloc < RelocEnd) { + while ((UINTN) Reloc < (UINTN) RelocEnd) { Fixup = PeCoffLoaderImageAddress (&ImageContext, RelocBase->VirtualAddress + (*Reloc & 0xFFF), 0); if (Fixup == NULL) { -- 2.16.2.windows.1