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