Skip to content

shim: change automatically enable MOK_POLICY_REQUIRE_NX #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vathpela merged 1 commit into from
Jul 25, 2025
+29 −0
Merged

shim: change automatically enable MOK_POLICY_REQUIRE_NX #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/memattrs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ extern EFI_STATUS update_mem_attrs(uintptr_t addr, uint64_t size,

extern void get_hsi_mem_info(void);
extern char *decode_hsi_bits(UINTN hsi);
extern void set_shim_nx_policy(void);

#endif /* !SHIM_MEMATTRS_H_ */
// vim:fenc=utf-8:tw=75:noet
27 changes: 27 additions & 0 deletions pe-relocate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,5 +661,32 @@ get_shim_nx_capability(EFI_HANDLE image_handle)
}
}

static inline bool
hsi_nx_is_enforced(void)
{
return !((hsi_status & SHIM_HSI_STATUS_HEAPX) ||
(hsi_status & SHIM_HSI_STATUS_STACKX) ||
(hsi_status & SHIM_HSI_STATUS_ROW));
}

static inline bool
hsi_api_is_present(void)
{
return (hsi_status & SHIM_HSI_STATUS_HASMAP) ||
((hsi_status & SHIM_HSI_STATUS_HASDSTGMSD &&
hsi_status & SHIM_HSI_STATUS_HASDSTSMSA));
}

void
set_shim_nx_policy(void)
{
if ((hsi_status & SHIM_HSI_STATUS_NX) &&
hsi_nx_is_enforced() &&
hsi_api_is_present())
{
mok_policy |= MOK_POLICY_REQUIRE_NX;
dprint("Enforcing NX policy for all images\n");
}
}

// vim:fenc=utf-8:tw=75:noet
1 change: 1 addition & 0 deletions shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,7 @@ efi_main (EFI_HANDLE passed_image_handle, EFI_SYSTEM_TABLE *passed_systab)

init_openssl();
get_hsi_mem_info();
set_shim_nx_policy();

efi_status = load_unbundled_trust(global_image_handle);
if (EFI_ERROR(efi_status)) {
Expand Down