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