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>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 3a844f1139dd6fdcc90278239c8f6ea43aad9f2e Mon Sep 17 00:00:00 2001
|
|
From: Lidong Chen <lidong.chen@oracle.com>
|
|
Date: Tue, 21 Jan 2025 19:02:39 +0000
|
|
Subject: [PATCH] misc: Ensure consistent overflow error messages
|
|
|
|
Update the overflow error messages to make them consistent
|
|
across the GRUB code.
|
|
|
|
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Upstream: f8795cde217e21539c2f236bcbb1a4bf521086b3
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
grub-core/fs/ntfs.c | 2 +-
|
|
grub-core/fs/ntfscomp.c | 2 +-
|
|
grub-core/video/readers/png.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
|
|
index bce81947c..b4c70a71d 100644
|
|
--- a/grub-core/fs/ntfs.c
|
|
+++ b/grub-core/fs/ntfs.c
|
|
@@ -364,7 +364,7 @@ retry:
|
|
goto retry;
|
|
}
|
|
}
|
|
- return grub_error (GRUB_ERR_BAD_FS, "run list overflown");
|
|
+ return grub_error (GRUB_ERR_BAD_FS, "run list overflow");
|
|
}
|
|
ctx->curr_vcn = ctx->next_vcn;
|
|
ctx->next_vcn += read_run_data (run, c1, 0); /* length of current VCN */
|
|
diff --git a/grub-core/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c
|
|
index f168a318e..b68bf5e40 100644
|
|
--- a/grub-core/fs/ntfscomp.c
|
|
+++ b/grub-core/fs/ntfscomp.c
|
|
@@ -30,7 +30,7 @@ static grub_err_t
|
|
decomp_nextvcn (struct grub_ntfs_comp *cc)
|
|
{
|
|
if (cc->comp_head >= cc->comp_tail)
|
|
- return grub_error (GRUB_ERR_BAD_FS, "compression block overflown");
|
|
+ return grub_error (GRUB_ERR_BAD_FS, "compression block overflow");
|
|
if (grub_disk_read
|
|
(cc->disk,
|
|
(cc->comp_table[cc->comp_head].next_lcn -
|
|
diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
|
|
index 3163e97bf..aa7524b7d 100644
|
|
--- a/grub-core/video/readers/png.c
|
|
+++ b/grub-core/video/readers/png.c
|
|
@@ -626,7 +626,7 @@ static grub_err_t
|
|
grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n)
|
|
{
|
|
if (--data->raw_bytes < 0)
|
|
- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflown");
|
|
+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflow");
|
|
|
|
if (data->cur_column == 0)
|
|
{
|
|
--
|
|
2.50.1
|
|
|