tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-25 10:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImageTool: Properly handle ELF base address

Browse Source
This commit is contained in:
Marvin Häuser 2023-04-15 13:44:23 +02:00 committed by Marvin Häuser
parent fa34c0e0bc
commit b4bcef3681
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BaseTools/ImageTool/ElfScan.c
View File

@ -7,6 +7,7 @@
static Elf_Ehdr *mEhdr = NULL; static Elf_Ehdr *mEhdr = NULL;
static Elf_Size mPeAlignment = 0x0; static Elf_Size mPeAlignment = 0x0;
static Elf_Addr mBaseAddress = 0x0;
#if defined (_MSC_EXTENSIONS) #if defined (_MSC_EXTENSIONS)
#define EFI_IMAGE_MACHINE_IA32 0x014C #define EFI_IMAGE_MACHINE_IA32 0x014C
@ -218,6 +219,7 @@ ParseElfFile (
// //
// Check section headers // Check section headers
// //
mBaseAddress = ~(Elf_Addr)0;
for (Index = 0; Index < mEhdr->e_shnum; ++Index) { for (Index = 0; Index < mEhdr->e_shnum; ++Index) {
Offset = (UINTN)mEhdr->e_shoff + Index * mEhdr->e_shentsize; Offset = (UINTN)mEhdr->e_shoff + Index * mEhdr->e_shentsize;
@ -245,6 +247,10 @@ ParseElfFile (
return RETURN_VOLUME_CORRUPTED; return RETURN_VOLUME_CORRUPTED;
} }
if (Shdr->sh_addr < mBaseAddress) {
mBaseAddress = Shdr->sh_addr;
}
if (Shdr->sh_addralign <= mPeAlignment) { if (Shdr->sh_addralign <= mPeAlignment) {
continue; continue;
} }
@ -329,14 +335,14 @@ SetRelocs (
New = TRUE; New = TRUE;
for (Index2 = 0; Index2 < RelNum; ++Index2) { for (Index2 = 0; Index2 < RelNum; ++Index2) {
if (((uint32_t)Rel->r_offset) == mImageInfo.RelocInfo.Relocs[Index2].Target) { if (((uint32_t)Rel->r_offset) == mBaseAddress + mImageInfo.RelocInfo.Relocs[Index2].Target) {
New = FALSE; New = FALSE;
} }
} }
if (New) { if (New) {
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_DIR64; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_DIR64;
mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)Rel->r_offset; mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)(Rel->r_offset - mBaseAddress);
++RelNum; ++RelNum;
} }
@ -344,7 +350,7 @@ SetRelocs (
case R_X86_64_32: case R_X86_64_32:
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW;
mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)Rel->r_offset; mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)(Rel->r_offset - mBaseAddress);
++RelNum; ++RelNum;
break; break;
@ -403,14 +409,14 @@ SetRelocs (
New = TRUE; New = TRUE;
for (Index2 = 0; Index2 < RelNum; ++Index2) { for (Index2 = 0; Index2 < RelNum; ++Index2) {
if (((uint32_t)Rel->r_offset) == mImageInfo.RelocInfo.Relocs[Index2].Target) { if (((uint32_t)Rel->r_offset) == mBaseAddress + mImageInfo.RelocInfo.Relocs[Index2].Target) {
New = FALSE; New = FALSE;
} }
} }
if (New) { if (New) {
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_DIR64; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_DIR64;
mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)Rel->r_offset; mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)(Rel->r_offset - mBaseAddress);
++RelNum; ++RelNum;
} }
@ -418,7 +424,7 @@ SetRelocs (
case R_AARCH64_ABS32: case R_AARCH64_ABS32:
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW;
mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)Rel->r_offset; mImageInfo.RelocInfo.Relocs[RelNum].Target = (uint32_t)(Rel->r_offset - mBaseAddress);
++RelNum; ++RelNum;
break; break;
@ -435,7 +441,7 @@ SetRelocs (
case R_386_32: case R_386_32:
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW;
mImageInfo.RelocInfo.Relocs[RelNum].Target = Rel->r_offset; mImageInfo.RelocInfo.Relocs[RelNum].Target = (Rel->r_offset - mBaseAddress);
++RelNum; ++RelNum;
break; break;
@ -488,7 +494,7 @@ SetRelocs (
case R_ARM_ABS32: case R_ARM_ABS32:
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW;
mImageInfo.RelocInfo.Relocs[RelNum].Target = Rel->r_offset; mImageInfo.RelocInfo.Relocs[RelNum].Target = (Rel->r_offset - mBaseAddress);
++RelNum; ++RelNum;
break; break;
@ -620,7 +626,7 @@ CreateIntermediate (
memcpy (Segments[SIndex].Data, (UINT8 *)mEhdr + Shdr->sh_offset, (size_t)Shdr->sh_size); memcpy (Segments[SIndex].Data, (UINT8 *)mEhdr + Shdr->sh_offset, (size_t)Shdr->sh_size);
Segments[SIndex].ImageAddress = Shdr->sh_addr; Segments[SIndex].ImageAddress = Shdr->sh_addr - mBaseAddress;
Segments[SIndex].ImageSize = Segments[SIndex].DataSize; Segments[SIndex].ImageSize = Segments[SIndex].DataSize;
Segments[SIndex].Read = true; Segments[SIndex].Read = true;
Segments[SIndex].Write = false; Segments[SIndex].Write = false;
@ -654,7 +660,7 @@ CreateIntermediate (
memcpy (Segments[SIndex].Data, (UINT8 *)mEhdr + Shdr->sh_offset, (size_t)Shdr->sh_size); memcpy (Segments[SIndex].Data, (UINT8 *)mEhdr + Shdr->sh_offset, (size_t)Shdr->sh_size);
} }
Segments[SIndex].ImageAddress = Shdr->sh_addr; Segments[SIndex].ImageAddress = Shdr->sh_addr - mBaseAddress;
Segments[SIndex].ImageSize = Segments[SIndex].DataSize; Segments[SIndex].ImageSize = Segments[SIndex].DataSize;
Segments[SIndex].Read = true; Segments[SIndex].Read = true;
Segments[SIndex].Write = true; Segments[SIndex].Write = true;
@ -673,7 +679,7 @@ CreateIntermediate (
if (Shdr->sh_type == SHT_PROGBITS) { if (Shdr->sh_type == SHT_PROGBITS) {
memcpy (mImageInfo.HiiInfo.Data, (UINT8 *)mEhdr + Shdr->sh_offset, (size_t)Shdr->sh_size); memcpy (mImageInfo.HiiInfo.Data, (UINT8 *)mEhdr + Shdr->sh_offset, (size_t)Shdr->sh_size);
SetHiiResourceHeader (mImageInfo.HiiInfo.Data, (UINT32)Shdr->sh_addr); SetHiiResourceHeader (mImageInfo.HiiInfo.Data, (UINT32)(Shdr->sh_addr - mBaseAddress));
} }
} else if ((Shdr->sh_flags & SHF_ALLOC) != 0) { } else if ((Shdr->sh_flags & SHF_ALLOC) != 0) {
fprintf (stderr, "ImageTool: Unknown SHF_ALLOC Section %d\n", SIndex); fprintf (stderr, "ImageTool: Unknown SHF_ALLOC Section %d\n", SIndex);
@ -704,8 +710,8 @@ ScanElf (
memset (&mImageInfo, 0, sizeof (mImageInfo)); memset (&mImageInfo, 0, sizeof (mImageInfo));
mImageInfo.HeaderInfo.BaseAddress = 0; mImageInfo.HeaderInfo.BaseAddress = mBaseAddress;
mImageInfo.HeaderInfo.EntryPointAddress = (uint32_t)mEhdr->e_entry; mImageInfo.HeaderInfo.EntryPointAddress = (uint32_t)(mEhdr->e_entry - mBaseAddress);
mImageInfo.HeaderInfo.IsXip = true; mImageInfo.HeaderInfo.IsXip = true;
mImageInfo.SegmentInfo.SegmentAlignment = (uint32_t)mPeAlignment; mImageInfo.SegmentInfo.SegmentAlignment = (uint32_t)mPeAlignment;
mImageInfo.RelocInfo.RelocsStripped = false; mImageInfo.RelocInfo.RelocsStripped = false;