mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -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>
78 lines
2.2 KiB
Diff
78 lines
2.2 KiB
Diff
From 6becb747027c4f9cdb10f23d6eb24fcc238e8b68 Mon Sep 17 00:00:00 2001
|
|
From: Egor Ignatov <egori@altlinux.org>
|
|
Date: Thu, 23 Jan 2025 20:44:15 +0300
|
|
Subject: [PATCH] fs/xfs: Propagate incorrect inode error from
|
|
grub_xfs_read_inode
|
|
|
|
The incorrect inode error from grub_xfs_read_inode did not propagate because
|
|
grub_print_error() resetted grub_errno, and grub_xfs_iterate_dir() did not
|
|
handle it at all.
|
|
|
|
Signed-off-by: Egor Ignatov <egori@altlinux.org>
|
|
Upstream: https://www.mail-archive.com/grub-devel@gnu.org/msg40098.html
|
|
[Not accepted upstream, but in Debian]
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
grub-core/fs/xfs.c | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
|
|
index e0daeb45f..28a342996 100644
|
|
--- a/grub-core/fs/xfs.c
|
|
+++ b/grub-core/fs/xfs.c
|
|
@@ -806,7 +806,6 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
|
|
fdiro = grub_malloc (sz);
|
|
if (!fdiro)
|
|
{
|
|
- grub_print_error ();
|
|
return 0;
|
|
}
|
|
|
|
@@ -818,7 +817,6 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
|
|
err = grub_xfs_read_inode (ctx->diro->data, ino, &fdiro->inode);
|
|
if (err)
|
|
{
|
|
- grub_print_error ();
|
|
grub_free (fdiro);
|
|
return 0;
|
|
}
|
|
@@ -858,9 +856,13 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
|
/* Synthesize the direntries for `.' and `..'. */
|
|
if (iterate_dir_call_hook (diro->ino, ".", &ctx))
|
|
return 1;
|
|
+ else if (grub_errno)
|
|
+ return 0;
|
|
|
|
if (iterate_dir_call_hook (parent, "..", &ctx))
|
|
return 1;
|
|
+ else if (grub_errno)
|
|
+ return 0;
|
|
|
|
for (i = 0; i < head->count &&
|
|
(grub_uint8_t *) de < ((grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data)); i++)
|
|
@@ -901,6 +903,9 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
|
}
|
|
de->name[de->len] = c;
|
|
|
|
+ if (grub_errno)
|
|
+ return 0;
|
|
+
|
|
de = grub_xfs_inline_next_de(dir->data, head, de);
|
|
}
|
|
break;
|
|
@@ -998,6 +1003,11 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
|
grub_free (dirblock);
|
|
return 1;
|
|
}
|
|
+ else if (grub_errno)
|
|
+ {
|
|
+ grub_free (dirblock);
|
|
+ return 0;
|
|
+ }
|
|
|
|
/*
|
|
* The expected number of directory entries is only tracked for the
|
|
--
|
|
2.50.1
|
|
|