From: "Gao, Liming" <liming.gao@intel.com>
To: "Gao, Liming" <liming.gao@intel.com>,
"Bi, Dandan" <dandan.bi@intel.com>,
"Hsueh, Hong-chihX" <hong-chihx.hsueh@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>,
Laszlo Ersek <lersek@redhat.com>
Subject: Re: [PATCH] MdePkg/BasePeCoffLib: skip runtime relocation if reloc info is invalid
Date: Thu, 31 Jan 2019 03:38:14 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3D3D66@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3D3D37@SHSMSX104.ccr.corp.intel.com>
Push at a824c7ebde0a431413329049252b8c1d3770de82
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Gao, Liming
> Sent: Thursday, January 31, 2019 11:31 AM
> To: Bi, Dandan <dandan.bi@intel.com>; Hsueh, Hong-chihX <hong-chihx.hsueh@intel.com>; edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Laszlo Ersek <lersek@redhat.com>
> Subject: Re: [edk2] [PATCH] MdePkg/BasePeCoffLib: skip runtime relocation if reloc info is invalid
>
> Reviewed-by: Liming Gao <liming.gao@intel.com>
>
> > -----Original Message-----
> > From: Bi, Dandan
> > Sent: Thursday, January 31, 2019 8:27 AM
> > To: Hsueh, Hong-chihX <hong-chihx.hsueh@intel.com>; edk2-devel@lists.01.org
> > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>; Laszlo Ersek <lersek@redhat.com>
> > Subject: RE: [PATCH] MdePkg/BasePeCoffLib: skip runtime relocation if reloc info is invalid
> >
> > Reviewed-by: Bi Dandan <dandan.bi@intel.com>
> >
> > Thanks,
> > Dandan
> > > -----Original Message-----
> > > From: Hsueh, Hong-chihX
> > > Sent: Wednesday, January 30, 2019 9:20 AM
> > > To: edk2-devel@lists.01.org
> > > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> > > <liming.gao@intel.com>; Bi, Dandan <dandan.bi@intel.com>; Laszlo Ersek
> > > <lersek@redhat.com>
> > > Subject: [PATCH] MdePkg/BasePeCoffLib: skip runtime relocation if reloc info
> > > is invalid
> > >
> > > 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 <hong-chihx.hsueh@intel.com>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Cc: Liming Gao <liming.gao@intel.com>
> > > Cc: Dandan Bi <dandan.bi@intel.com>
> > > Cc: Laszlo Ersek <lersek@redhat.com>
> > > ---
> > > MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 30
> > > ++++++++++++++++++++----------
> > > 1 file changed, 20 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> > > b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> > > index 1bd079ad6a..e2c62e1932 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;
> > > @@ -1739,13 +1739,23 @@ PeCoffLoaderRelocateImageForRuntime (
> > > // is present in the image. You have to check the NumberOfRvaAndSizes in
> > > // the optional header to verify a desired directory entry is there.
> > > //
> > > + RelocBase = NULL;
> > > + RelocBaseEnd = NULL;
> > > if (NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
> > > RelocDir = DataDirectory + EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC;
> > > - RelocBase = (EFI_IMAGE_BASE_RELOCATION *)
> > > PeCoffLoaderImageAddress (&ImageContext, RelocDir->VirtualAddress, 0);
> > > - RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *)
> > > PeCoffLoaderImageAddress (&ImageContext,
> > > - RelocDir->VirtualAddress + RelocDir-
> > > >Size - 1,
> > > - 0
> > > - );
> > > + if ((RelocDir != NULL) && (RelocDir->Size > 0)) {
> > > + RelocBase = (EFI_IMAGE_BASE_RELOCATION *)
> > > PeCoffLoaderImageAddress (&ImageContext, RelocDir->VirtualAddress, 0);
> > > + RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *)
> > > PeCoffLoaderImageAddress (&ImageContext,
> > > + 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 +1779,7 @@ PeCoffLoaderRelocateImageForRuntime (
> > > //
> > > FixupData = RelocationData;
> > > RelocBaseOrig = RelocBase;
> > > - while (RelocBase < RelocBaseEnd) {
> > > + while ((UINTN) RelocBase < (UINTN) RelocBaseEnd) {
> > > //
> > > // Add check for RelocBase->SizeOfBlock field.
> > > //
> > > @@ -1794,7 +1804,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
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2019-01-31 3:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 1:19 [PATCH] MdePkg/BasePeCoffLib: skip runtime relocation if reloc info is invalid Neo Hsueh
2019-01-30 14:45 ` Laszlo Ersek
2019-01-31 0:27 ` Bi, Dandan
2019-01-31 3:30 ` Gao, Liming
2019-01-31 3:38 ` Gao, Liming [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-01-29 18:50 Neo Hsueh
2019-01-30 14:42 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E3D3D66@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox