0043-fs-bfs-Disable-under-lockdown.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From 71487b0cf0f7c3fa45f450ed1f3ea4cedd8002a1 Mon Sep 17 00:00:00 2001
  2. From: Daniel Axtens <dja@axtens.net>
  3. Date: Sat, 23 Mar 2024 15:59:43 +1100
  4. Subject: [PATCH] fs/bfs: Disable under lockdown
  5. The BFS is not fuzz-clean. Don't allow it to be loaded under lockdown.
  6. This will also disable the AFS.
  7. Fixes: CVE-2024-45778
  8. Fixes: CVE-2024-45779
  9. Reported-by: Nils Langius <nils@langius.de>
  10. Signed-off-by: Daniel Axtens <dja@axtens.net>
  11. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  12. Upstream: 26db6605036bd9e5b16d9068a8cc75be63b8b630
  13. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  14. ---
  15. grub-core/fs/bfs.c | 11 ++++++++---
  16. 1 file changed, 8 insertions(+), 3 deletions(-)
  17. diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c
  18. index f37b16895..c92fd7916 100644
  19. --- a/grub-core/fs/bfs.c
  20. +++ b/grub-core/fs/bfs.c
  21. @@ -30,6 +30,7 @@
  22. #include <grub/types.h>
  23. #include <grub/i18n.h>
  24. #include <grub/fshelp.h>
  25. +#include <grub/lockdown.h>
  26. GRUB_MOD_LICENSE ("GPLv3+");
  27. @@ -1106,8 +1107,11 @@ GRUB_MOD_INIT (bfs)
  28. {
  29. COMPILE_TIME_ASSERT (1 << LOG_EXTENT_SIZE ==
  30. sizeof (struct grub_bfs_extent));
  31. - grub_bfs_fs.mod = mod;
  32. - grub_fs_register (&grub_bfs_fs);
  33. + if (!grub_is_lockdown ())
  34. + {
  35. + grub_bfs_fs.mod = mod;
  36. + grub_fs_register (&grub_bfs_fs);
  37. + }
  38. }
  39. #ifdef MODE_AFS
  40. @@ -1116,5 +1120,6 @@ GRUB_MOD_FINI (afs)
  41. GRUB_MOD_FINI (bfs)
  42. #endif
  43. {
  44. - grub_fs_unregister (&grub_bfs_fs);
  45. + if (!grub_is_lockdown ())
  46. + grub_fs_unregister (&grub_bfs_fs);
  47. }
  48. --
  49. 2.50.1