diff options
| author | Dandan Bi <dandan.bi@intel.com> | 2019-01-17 15:25:26 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2019-01-21 10:12:04 +0800 |
| commit | eb76b76218d5bac867414e2ff6dd09c6e7c700dd (patch) | |
| tree | 9c4cff23c1cee9bc9c01912d9cbfc2d26158ce45 /MdePkg/Library | |
| parent | cce9d763580a955d294a5e3696cbe07a03965e2b (diff) | |
| download | edk2-eb76b76218d5bac867414e2ff6dd09c6e7c700dd.tar.gz edk2-eb76b76218d5bac867414e2ff6dd09c6e7c700dd.tar.bz2 edk2-eb76b76218d5bac867414e2ff6dd09c6e7c700dd.zip | |
MdePkg/BasePeCoffLib: Correct the address of RelocBaseEnd
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>
Tested-by: Gary Lin <glin@suse.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'MdePkg/Library')
| -rw-r--r-- | MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ -1743,7 +1743,7 @@ PeCoffLoaderRelocateImageForRuntime ( 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 {
|