vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

efi: change heap allocation type to GRUB_EFI_LOADER_CODE

Browse source 
With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may
not return regions with execute ability. Since modules are loaded onto
the heap, change the heap allocation type to GRUB_EFI_LOADER_CODE in
order to permit execution on systems with this feature enabled.

Closes: 50420

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Leif Lindholm 2017-08-03 11:04:32 +01:00 committed by Vladimir Serbinenko
parent 91212e0aa0
commit f826330683
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub-core/kern/efi/mm.c
View file

@ -403,7 +403,9 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
pages = required_pages; pages = required_pages;
} }
addr = grub_efi_allocate_fixed (start, pages); addr = grub_efi_allocate_pages_real (start, pages,
GRUB_EFI_ALLOCATE_ADDRESS,
GRUB_EFI_LOADER_CODE);
if (! addr) if (! addr)
grub_fatal ("cannot allocate conventional memory %p with %u pages", grub_fatal ("cannot allocate conventional memory %p with %u pages",
(void *) ((grub_addr_t) start), (void *) ((grub_addr_t) start),