1From 9c5565135f12400a925ee901b25984e7af4442f5 Mon Sep 17 00:00:00 2001 2From: Javier Martinez Canillas <javierm@redhat.com> 3Date: Wed, 24 Feb 2021 14:44:38 +0100 4Subject: [PATCH] loader/xnu: Don't allow loading extension and packages when 5 locked down 6 7The shim_lock verifier validates the XNU kernels but no its extensions 8and packages. Prevent these to be loaded when the GRUB is locked down. 9 10Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> 11Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 12Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 13--- 14 grub-core/loader/xnu.c | 31 +++++++++++++++++-------------- 15 1 file changed, 17 insertions(+), 14 deletions(-) 16 17diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c 18index 9ae4ceb..44fd5a9 100644 19--- a/grub-core/loader/xnu.c 20+++ b/grub-core/loader/xnu.c 21@@ -1485,20 +1485,23 @@ GRUB_MOD_INIT(xnu) 22 N_("Load XNU image.")); 23 cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64, 24 0, N_("Load 64-bit XNU image.")); 25- cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0, 26- N_("Load XNU extension package.")); 27- cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0, 28- N_("Load XNU extension.")); 29- cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir, 30- /* TRANSLATORS: OSBundleRequired is a 31- variable name in xnu extensions 32- manifests. It behaves mostly like 33- GNU/Linux runlevels. 34- */ 35- N_("DIRECTORY [OSBundleRequired]"), 36- /* TRANSLATORS: There are many extensions 37- in extension directory. */ 38- N_("Load XNU extension directory.")); 39+ cmd_mkext = grub_register_command_lockdown ("xnu_mkext", grub_cmd_xnu_mkext, 0, 40+ N_("Load XNU extension package.")); 41+ cmd_kext = grub_register_command_lockdown ("xnu_kext", grub_cmd_xnu_kext, 0, 42+ N_("Load XNU extension.")); 43+ cmd_kextdir = grub_register_command_lockdown ("xnu_kextdir", grub_cmd_xnu_kextdir, 44+ /* 45+ * TRANSLATORS: OSBundleRequired is 46+ * a variable name in xnu extensions 47+ * manifests. It behaves mostly like 48+ * GNU/Linux runlevels. 49+ */ 50+ N_("DIRECTORY [OSBundleRequired]"), 51+ /* 52+ * TRANSLATORS: There are many extensions 53+ * in extension directory. 54+ */ 55+ N_("Load XNU extension directory.")); 56 cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0, 57 /* TRANSLATORS: ramdisk here isn't identifier. It can be translated. */ 58 N_("Load XNU ramdisk. " 59-- 602.14.2 61 62