proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-06-15 14:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use EfiLoaderCode memory for loading PE/COFF executables

Browse Source 
Under a strict memory protection policy, UEFI may give out EfiLoaderData
memory with the XN attribute set. So use EfiLoaderCode explicitly.

At the same time, use a page based allocation rather than a pool
allocation, which is more appropriate when loading PE/COFF images.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
Ard Biesheuvel 2017-02-28 17:10:23 +00:00 committed by Peter Jones
parent 83c62ff582
commit 97022acd36
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shim.c
View File

@ -1191,7 +1191,8 @@ static EFI_STATUS handle_image (void *data, unsigned int datasize,
EFI_IMAGE_SECTION_HEADER *Section; EFI_IMAGE_SECTION_HEADER *Section;
char *base, *end; char *base, *end;
PE_COFF_LOADER_IMAGE_CONTEXT context; PE_COFF_LOADER_IMAGE_CONTEXT context;
unsigned int alignment; unsigned int alignment, alloc_size;
EFI_PHYSICAL_ADDRESS alloc_address;
int found_entry_point = 0; int found_entry_point = 0;
/* /*
@ -1236,20 +1237,29 @@ static EFI_STATUS handle_image (void *data, unsigned int datasize,
if (!alignment) if (!alignment)
alignment = 4096; alignment = 4096;
buffer = AllocatePool(context.ImageSize + context.SectionAlignment); alloc_size = ALIGN_VALUE(context.ImageSize + context.SectionAlignment,
buffer = ALIGN_POINTER(buffer, alignment); PAGE_SIZE);
if (!buffer) { efi_status = uefi_call_wrapper (BS->AllocatePages, 4,
AllocateAnyPages,
EfiLoaderCode,
alloc_size / PAGE_SIZE,
&alloc_address);
if (efi_status != EFI_SUCCESS) {
perror(L"Failed to allocate image buffer\n"); perror(L"Failed to allocate image buffer\n");
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
buffer = (void *)ALIGN_VALUE((unsigned long)alloc_address, alignment);
CopyMem(buffer, data, context.SizeOfHeaders); CopyMem(buffer, data, context.SizeOfHeaders);
entry_point = ImageAddress(buffer, context.ImageSize, context.EntryPoint); entry_point = ImageAddress(buffer, context.ImageSize, context.EntryPoint);
if (!entry_point) { if (!entry_point) {
perror(L"Entry point is invalid\n"); perror(L"Entry point is invalid\n");
FreePool(buffer); uefi_call_wrapper(BS->FreePages, 2, alloc_address,
alloc_size / PAGE_SIZE);
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -1283,7 +1293,8 @@ static EFI_STATUS handle_image (void *data, unsigned int datasize,
if (end < base) { if (end < base) {
perror(L"Section %d has negative size\n", i); perror(L"Section %d has negative size\n", i);
FreePool(buffer); uefi_call_wrapper(BS->FreePages, 2, alloc_address,
alloc_size / PAGE_SIZE);
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }