mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 13:18:36 -09:00
ded3e0045a
This patch brings the entire stack of Debian patches on grub2 titled "cve-2025-jan" and available at: https://salsa.debian.org/grub-team/grub/-/tree/debian/2.12-9/debian/patches/cve-2025-jan?ref_type=tags As of this exact Debian grub2 version 2.12-9. Some minor conflicts had to be fixed. All patches are in upstream Grub master, but mixed with hundreds of other changes, which is why Debian's effort to backport them has been leveraged here. In addition to those patches, 2 extra patches are added: 0073-net-drivers-ieee1275-ofnet-Add-missing-grub_malloc.patch 0074-Constant-time-grub_crypto_memcmp.patch The first one fixes an issue in one of the earlier patches. The fix is not in Debian, but is in upstream Grub. The second one fixes another CVE, not fixed in Debian, but fixed in OpenSUSE. This fix is not upstream as upstream has decided to move to libgcrypt instead to avoid the problem, but that's a fairly large change. Overall, this patch fixes all CVEs currently reported by pkg-stats against our grub2 package, namely: CVE-2024-45777 CVE-2024-45778 CVE-2024-45779 CVE-2024-45780 CVE-2024-45782 CVE-2024-56737 CVE-2024-56738 CVE-2025-0678 CVE-2025-0684 CVE-2025-0685 CVE-2025-0686 CVE-2025-0689 CVE-2025-1125 With the previous fixes on runtime tests added (to use glibc toolchains to build grub2 tests), this commit successfully passes all tests: - The ISO9660 tests that use grub2: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/1985234563 - The grub2 tests: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/1985234685 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Julien: also tested by building and booting - qemu_aarch64_sbsa_defconfig - qemu_arm_ebbr_defconfig - qemu_loongarch64_virt_efi_defconfig - qemu_riscv64_virt_efi_defconfig - pc_x86_64_bios_defconfig - pc_x86_64_efi_defconfig ] Tested-by: Julien Olivain <ju.o@free.fr> [Julien: - fix patch #72 upstream link to point to the initial patch sumbission rather than a reply - merge two _IGNORE_CVES blocks for patch #50 into a single one - order _IGNORE_CVES blocks by numerical patch order - order numerically the CVE list in commit log - add a "Fixes:" tag in patch #74 since its commit log does not mention the CVE. ] Signed-off-by: Julien Olivain <ju.o@free.fr>
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 3acd964eafdd32e8ab7d7c04b18171052a859d3a Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Fri, 31 May 2024 15:14:42 +0800
|
|
Subject: [PATCH] fs/iso9660: Fix invalid free
|
|
|
|
The ctx->filename can point to either a string literal or a dynamically
|
|
allocated string. The ctx->filename_alloc field is used to indicate the
|
|
type of allocation.
|
|
|
|
An issue has been identified where ctx->filename is reassigned to
|
|
a string literal in susp_iterate_dir() but ctx->filename_alloc is not
|
|
correctly handled. This oversight causes a memory leak and an invalid
|
|
free operation later.
|
|
|
|
The fix involves checking ctx->filename_alloc, freeing the allocated
|
|
string if necessary and clearing ctx->filename_alloc for string literals.
|
|
|
|
Reported-by: Daniel Axtens <dja@axtens.net>
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Upstream: 1443833a9535a5873f7de3798cf4d8389f366611
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
grub-core/fs/iso9660.c | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
|
|
index 8d480e602..8e3c95c4f 100644
|
|
--- a/grub-core/fs/iso9660.c
|
|
+++ b/grub-core/fs/iso9660.c
|
|
@@ -628,9 +628,19 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry,
|
|
filename type is stored. */
|
|
/* FIXME: Fix this slightly improper cast. */
|
|
if (entry->data[0] & GRUB_ISO9660_RR_DOT)
|
|
- ctx->filename = (char *) ".";
|
|
+ {
|
|
+ if (ctx->filename_alloc)
|
|
+ grub_free (ctx->filename);
|
|
+ ctx->filename_alloc = 0;
|
|
+ ctx->filename = (char *) ".";
|
|
+ }
|
|
else if (entry->data[0] & GRUB_ISO9660_RR_DOTDOT)
|
|
- ctx->filename = (char *) "..";
|
|
+ {
|
|
+ if (ctx->filename_alloc)
|
|
+ grub_free (ctx->filename);
|
|
+ ctx->filename_alloc = 0;
|
|
+ ctx->filename = (char *) "..";
|
|
+ }
|
|
else if (entry->len >= 5)
|
|
{
|
|
grub_size_t off = 0, csize = 1;
|
|
--
|
|
2.50.1
|
|
|