From: "Gao, Liming" <liming.gao@intel.com>
To: "Wu, Hao A" <hao.a.wu@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH] BaseTools/PeCoffLib: Check 'RelocDir' before finding the relocation block
Date: Wed, 9 Nov 2016 05:21:57 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14B4A0D27@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <1478668705-5484-1-git-send-email-hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: Wu, Hao A
> Sent: Wednesday, November 09, 2016 1:18 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Gao, Liming <liming.gao@intel.com>;
> Zhu, Yonghong <yonghong.zhu@intel.com>
> Subject: [PATCH] BaseTools/PeCoffLib: Check 'RelocDir' before finding the
> relocation block
>
> 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
prev parent reply other threads:[~2016-11-09 5:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=4A89E2EF3DFEDB4C8BFDE51014F606A14B4A0D27@shsmsx102.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