0106-fs-hfs-Disable-under-lockdown.patch 1.2 KB

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