From: Gary Lin <glin@suse.com>
To: Dandan Bi <dandan.bi@intel.com>
Cc: edk2-devel@lists.01.org,
Michael D Kinney <michael.d.kinney@intel.com>,
Liming Gao <liming.gao@intel.com>
Subject: Re: [patch] MdePkg/BasePeCoffLib: Correct the address of RelocBaseEnd
Date: Fri, 18 Jan 2019 16:59:35 +0800 [thread overview]
Message-ID: <20190118085935.GS3972@GaryWorkstation> (raw)
In-Reply-To: <20190118080857.5016-1-dandan.bi@intel.com>
On Fri, Jan 18, 2019 at 04:08:57PM +0800, Dandan Bi wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1426
>
> When calculating the address of RelocBaseEnd,
> the RelocBase address is ImageBase + RelocDir->VirtualAddress,
> the size of RelocDir is RelocDir->Size.
> So the RelocBaseEnd address is:
> ImageBase + RelocDir->VirtualAddress + RelocDir->Size - 1
> not
> ImageBase + RelocDir->VirtualAddress + RelocDir->Size
>
> This patch is to fix this issue when call PeCoffLoaderImageAddress
> function to calculate the address of RelocBaseEnd.
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Thanks for the patch.
Tested-by: Gary Lin <glin@suse.com>
> ---
> MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> index d9c94b89bd..1bd079ad6a 100644
> --- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> +++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
> @@ -1741,11 +1741,11 @@ PeCoffLoaderRelocateImageForRuntime (
> //
> 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,
> + RelocDir->VirtualAddress + RelocDir->Size - 1,
> 0
> );
> } else {
> //
> // Cannot find relocations, cannot continue to relocate the image, ASSERT for this invalid image.
> --
> 2.18.0.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-18 8:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 8:08 [patch] MdePkg/BasePeCoffLib: Correct the address of RelocBaseEnd Dandan Bi
2019-01-18 8:59 ` Gary Lin [this message]
2019-01-21 0:48 ` Gao, Liming
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=20190118085935.GS3972@GaryWorkstation \
--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