OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure that ELF images are loaded at their preferred address (#1833) 

Currently, loading an ELF image will relocate the image (to its
preferred load address) only if there is at least one ELF segment
that is not completely contained in the file loaded (i.e. the memory
segment size is larger than the size inside the file. This behavior
is generally triggered by the segment that contains the .bss section).

Consequently, images that contain initialized data only (e.g. QNX IFS
files) don't get relocated, and will usually crash when jumping to the
image entry point.

This change checks whether the ELF image is already loaded at the
preferred address, and forces image relocation if not.

Signed-off-by: Bruno Achauer <bruno.achauer@intel.com>
This commit is contained in:
Bruno Achauer 2023-02-21 17:40:13 +01:00 committed by GitHub
parent b0aba716cf
commit 3f0beb9fa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BootloaderCommonPkg/Library/ElfLib/ElfLib.c
View File

@ -1,7 +1,7 @@
/** @file
ELF library
Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2019-2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@ -242,6 +242,7 @@ ParseElfImage (
UINTN End;
UINTN Base;
UINTN FileOffset;
UINT8 *CurrentLoadAddress;
if (ElfCt == NULL) {
return EFI_INVALID_PARAMETER;
@ -317,10 +318,14 @@ ParseElfImage (
//
ElfCt->ImageSize = End - Base + 1;
ElfCt->PreferredImageAddress = (VOID *) Base;
CurrentLoadAddress = ElfCt->FileBase + FileOffset;
if (ElfCt->PreferredImageAddress != CurrentLoadAddress) {
ElfCt->ReloadRequired = TRUE;
}
if (ElfCt->ReloadRequired) {
ElfCt->ImageAddress = NULL;
} else {
ElfCt->ImageAddress = ElfCt->FileBase + FileOffset;
ElfCt->ImageAddress = CurrentLoadAddress;
}
CalculateElfFileSize (ElfCt, &ElfCt->FileSize);