Skip to content

Commit 79995cc

Browse files
committed
pe: handle_image: skipping update memory attributes when image does not support NX
By default, the MOK_POLICY_REQUIRE_NX bit is disabled which means that it is permissible to load binaries which do not support NX mitigations. But many old grub2 are not really tested with update memory attributes protocol. Especially they are not page alignment. We may got similar page fault exception as the following: memattrs.c:269:efi_get_mem_attrs() efi_get_mem_attrs called on 0x7DA7AA00-0x7DA7B9FF and attrs 0x7FED45A0 Invalid call efi_update_mem_attrs(addr:0x7DA7AA00-0x7DA7B9FF, size:0x1000, +r, -) addr is not page aligned !!!! X64 Exception Type - 0E(#PF - Page-Fault) CPU Apic ID - 00000000 !!!! ExceptionData - 0000000000000011 I:1 R:0 U:0 W:0 P:1 PK:0 SS:0 SGX:0 RIP - 000000007D972400, CS - 0000000000000038, RFLAGS - 0000000000010202 RAX - 0000000000000000, RCX - 000000007E467A98, RDX - 000000007F9EC018 RBX - 0000000000000000, RSP - 000000007FED46D8, RBP - 000000007E467A98 RSI - 000000007D972000, RDI - 000000007DD5AD40 R8 - 0000000000000036, R9 - 000000007DD51D18, R10 - 0000000000000000 R11 - 0000000000000002, R12 - 000000007E467A98, R13 - 000000007DC14CE8 R14 - 000000007DC14BA0, R15 - 000000007DC42410 DS - 0000000000000030, ES - 0000000000000030, FS - 0000000000000030 GS - 0000000000000030, SS - 0000000000000030 CR0 - 0000000080010033, CR2 - 000000007D972400, CR3 - 000000007FC01000 CR4 - 0000000000000668, CR8 - 0000000000000000 DR0 - 0000000000000000, DR1 - 0000000000000000, DR2 - 0000000000000000 DR3 - 0000000000000000, DR6 - 00000000FFFF0FF0, DR7 - 0000000000000400 GDTR - 000000007F9DC000 0000000000000047, LDTR - 0000000000000000 IDTR - 000000007F192018 0000000000000FFF, TR - 0000000000000000 FXSAVE_STATE - 000000007FED4330 !!!! Find image based on IP(0x7DBAE663) (No PDB) (ImageBase=000000007DB87000, EntryPoint=000000007DBAC000) !!!! So let's skip updating memory attributes when the image does not support NX. (aka. the EFI_IMAGE_DLLCHARACTERISTICS_NX_COMPAT dll characteristics is not raised) Signed-off-by: Chun-Yi Lee <[email protected]>
1 parent d44405e commit 79995cc

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

pe.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@ handle_image (void *data, unsigned int datasize,
478478
int found_entry_point = 0;
479479
UINT8 sha1hash[SHA1_DIGEST_SIZE];
480480
UINT8 sha256hash[SHA256_DIGEST_SIZE];
481+
bool nx_compat = 0;
481482

482483
/*
483484
* The binary header contains relevant context and section pointers
@@ -562,12 +563,16 @@ handle_image (void *data, unsigned int datasize,
562563
return EFI_OUT_OF_RESOURCES;
563564
}
564565

566+
nx_compat = (context.DllCharacteristics & EFI_IMAGE_DLLCHARACTERISTICS_NX_COMPAT);
565567
buffer = (void *)ALIGN_VALUE((unsigned long)*alloc_address, alignment);
566568
dprint(L"Loading 0x%llx bytes at 0x%llx\n",
567569
(unsigned long long)context.ImageSize,
568570
(unsigned long long)(uintptr_t)buffer);
569-
update_mem_attrs((uintptr_t)buffer, alloc_size, MEM_ATTR_R|MEM_ATTR_W,
570-
MEM_ATTR_X);
571+
if (nx_compat)
572+
update_mem_attrs((uintptr_t)buffer, alloc_size,
573+
MEM_ATTR_R|MEM_ATTR_W, MEM_ATTR_X);
574+
else
575+
perror(L"Image does not support NX\n");
571576

572577
CopyMem(buffer, data, context.SizeOfHeaders);
573578

@@ -730,6 +735,8 @@ handle_image (void *data, unsigned int datasize,
730735
/*
731736
* Now set the page permissions appropriately.
732737
*/
738+
if (!nx_compat)
739+
goto skip_set_page_permissions;
733740
Section = context.FirstSection;
734741
for (i = 0; i < context.NumberOfSections; i++, Section++) {
735742
uint64_t set_attrs = MEM_ATTR_R;
@@ -774,7 +781,7 @@ handle_image (void *data, unsigned int datasize,
774781
update_mem_attrs(addr, length, set_attrs, clear_attrs);
775782
}
776783

777-
784+
skip_set_page_permissions:
778785
/*
779786
* grub needs to know its location and size in memory, so fix up
780787
* the loaded image protocol values

0 commit comments

Comments
 (0)