1From 1c15848838d924552611247110723e2a1c17a5a1 Mon Sep 17 00:00:00 2001 2From: Daniel Axtens <dja@axtens.net> 3Date: Mon, 18 Jan 2021 12:19:07 +1100 4Subject: [PATCH] fs/hfs: Disable under lockdown 5 6HFS has issues such as infinite mutual recursion that are simply too 7complex to fix for such a legacy format. So simply do not permit 8it to be loaded under lockdown. 9 10Signed-off-by: Daniel Axtens <dja@axtens.net> 11Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 12Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 13--- 14 grub-core/fs/hfs.c | 7 +++++-- 15 1 file changed, 5 insertions(+), 2 deletions(-) 16 17diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c 18index 3fe842b..9a5b7bb 100644 19--- a/grub-core/fs/hfs.c 20+++ b/grub-core/fs/hfs.c 21@@ -30,6 +30,7 @@ 22 #include <grub/hfs.h> 23 #include <grub/i18n.h> 24 #include <grub/fshelp.h> 25+#include <grub/lockdown.h> 26 27 GRUB_MOD_LICENSE ("GPLv3+"); 28 29@@ -1433,11 +1434,13 @@ static struct grub_fs grub_hfs_fs = 30 31 GRUB_MOD_INIT(hfs) 32 { 33- grub_fs_register (&grub_hfs_fs); 34+ if (!grub_is_lockdown ()) 35+ grub_fs_register (&grub_hfs_fs); 36 my_mod = mod; 37 } 38 39 GRUB_MOD_FINI(hfs) 40 { 41- grub_fs_unregister (&grub_hfs_fs); 42+ if (!grub_is_lockdown()) 43+ grub_fs_unregister (&grub_hfs_fs); 44 } 45-- 462.14.2 47 48