65c99394ff
Grub 2.06 is affected by a number of CVEs, which have been fixed in the master branch of Grub, but are not yet part of any release (there is a 2.12-rc1 release, but nothing else between 2.06 and 2.12-rc1). So this patch backports the relevant fixes for CVE-2022-28736, CVE-2022-28735, CVE-2021-3695, CVE-2021-3696, CVE-2021-3697, CVE-2022-28733, CVE-2022-28734, CVE-2022-2601 and CVE-2022-3775. It should be noted that CVE-2021-3695, CVE-2021-3696, CVE-2021-3697 are not reported as affecting Grub by our CVE matching logic because the NVD database uses an incorrect CPE ID in those CVEs: it uses "grub" as the product instead of "grub2" like all other CVEs for grub. This issue has been reported to the NVD maintainers. This requires backporting a lot of patches, but jumping from 2.06 to 2.12-rc1 implies getting 592 commits, which is quite a lot. All Grub test cases are working fine: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/984500585 https://gitlab.com/tpetazzoni/buildroot/-/pipelines/984500679 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Arnout: fix check-package warning in patch 0002] Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From 583fca49f413e00fe26f8ae7abe0837bbc574f79 Mon Sep 17 00:00:00 2001
|
|
From: Chris Coulson <chris.coulson@canonical.com>
|
|
Date: Tue, 5 Apr 2022 11:48:58 +0100
|
|
Subject: [PATCH] loader/efi/chainloader: Use grub_loader_set_ex()
|
|
|
|
This ports the EFI chainloader to use grub_loader_set_ex() in order to fix
|
|
a use-after-free bug that occurs when grub_cmd_chainloader() is executed
|
|
more than once before a boot attempt is performed.
|
|
|
|
Fixes: CVE-2022-28736
|
|
|
|
Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Upstream: 04c86e0bb7b58fc2f913f798cdb18934933e532d
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
grub-core/loader/efi/chainloader.c | 16 +++++++---------
|
|
1 file changed, 7 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
|
index d1602c89b..7557eb269 100644
|
|
--- a/grub-core/loader/efi/chainloader.c
|
|
+++ b/grub-core/loader/efi/chainloader.c
|
|
@@ -44,11 +44,10 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
-static grub_efi_handle_t image_handle;
|
|
-
|
|
static grub_err_t
|
|
-grub_chainloader_unload (void)
|
|
+grub_chainloader_unload (void *context)
|
|
{
|
|
+ grub_efi_handle_t image_handle = (grub_efi_handle_t) context;
|
|
grub_efi_loaded_image_t *loaded_image;
|
|
grub_efi_boot_services_t *b;
|
|
|
|
@@ -64,8 +63,9 @@ grub_chainloader_unload (void)
|
|
}
|
|
|
|
static grub_err_t
|
|
-grub_chainloader_boot (void)
|
|
+grub_chainloader_boot (void *context)
|
|
{
|
|
+ grub_efi_handle_t image_handle = (grub_efi_handle_t) context;
|
|
grub_efi_boot_services_t *b;
|
|
grub_efi_status_t status;
|
|
grub_efi_uintn_t exit_data_size;
|
|
@@ -225,6 +225,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
|
|
grub_efi_physical_address_t address = 0;
|
|
grub_efi_uintn_t pages = 0;
|
|
grub_efi_char16_t *cmdline = NULL;
|
|
+ grub_efi_handle_t image_handle = NULL;
|
|
|
|
if (argc == 0)
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
|
@@ -405,7 +406,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
|
|
efi_call_2 (b->free_pages, address, pages);
|
|
grub_free (file_path);
|
|
|
|
- grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
|
|
+ grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0);
|
|
return 0;
|
|
|
|
fail:
|
|
@@ -423,10 +424,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
|
|
efi_call_2 (b->free_pages, address, pages);
|
|
|
|
if (image_handle != NULL)
|
|
- {
|
|
- efi_call_1 (b->unload_image, image_handle);
|
|
- image_handle = NULL;
|
|
- }
|
|
+ efi_call_1 (b->unload_image, image_handle);
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
--
|
|
2.41.0
|
|
|