diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-02-16 01:18:28 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-02-16 01:18:28 +0000 |
| commit | 6beb225a9a20e791157937d095159c7d61b6ec20 (patch) | |
| tree | 13609b37288f07abd0ff3de262f74d021a8959e7 /MdePkg/Library/BasePeCoffLib | |
| parent | 5788e95470ef53ff4b47e59ed6b097818077513e (diff) | |
| download | edk2-6beb225a9a20e791157937d095159c7d61b6ec20.tar.gz edk2-6beb225a9a20e791157937d095159c7d61b6ec20.tar.bz2 edk2-6beb225a9a20e791157937d095159c7d61b6ec20.zip | |
Per PI1.2B spec, for the case that TE Image Relocation Data Directory Entry Virtual Address is non-zero, but the Relocation Data Directory Size is zero, BasePeCoffLib should only handle such case as PIC TE image.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11315 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/BasePeCoffLib')
| -rw-r--r-- | MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c index 7337bc359a..064917cd9b 100644 --- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c +++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c @@ -2,7 +2,7 @@ Base PE/COFF loader supports loading any PE32/PE32+ or TE image, but
only supports relocating IA32, x64, IPF, and EBC images.
- Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -279,6 +279,14 @@ PeCoffLoaderGetImageInfo ( } else {
ImageContext->RelocationsStripped = FALSE;
}
+
+ //
+ // TE Image Relocation Data Directory Entry size is non-zero, but the Relocation Data Directory Virtual Address is zero.
+ // This case is not a valid TE image.
+ //
+ if ((ImageContext->IsTeImage) && (Hdr.Te->DataDirectory[0].Size != 0) && (Hdr.Te->DataDirectory[0].VirtualAddress == 0)) {
+ return RETURN_INVALID_PARAMETER;
+ }
if (!(ImageContext->IsTeImage)) {
if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
|