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>
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 5d483e4c7c5a20a17a413f0cc51decfbb5828a5a Mon Sep 17 00:00:00 2001
|
|
From: Lidong Chen <lidong.chen@oracle.com>
|
|
Date: Wed, 22 Jan 2025 18:04:43 +0000
|
|
Subject: [PATCH] net: Prevent overflows when allocating memory for arrays
|
|
|
|
Use grub_calloc() when allocating memory for arrays to ensure proper
|
|
overflow checks are in place.
|
|
|
|
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Upstream: dee2c14fd66bc497cdc74c69fde8c9b84637c8eb
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
grub-core/net/dns.c | 4 ++--
|
|
grub-core/net/net.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
|
|
index 39b0c46cf..f20cd6f83 100644
|
|
--- a/grub-core/net/dns.c
|
|
+++ b/grub-core/net/dns.c
|
|
@@ -470,8 +470,8 @@ grub_net_dns_lookup (const char *name,
|
|
&& grub_get_time_ms () < dns_cache[h].limit_time)
|
|
{
|
|
grub_dprintf ("dns", "retrieved from cache\n");
|
|
- *addresses = grub_malloc (dns_cache[h].naddresses
|
|
- * sizeof ((*addresses)[0]));
|
|
+ *addresses = grub_calloc (dns_cache[h].naddresses,
|
|
+ sizeof ((*addresses)[0]));
|
|
if (!*addresses)
|
|
return grub_errno;
|
|
*naddresses = dns_cache[h].naddresses;
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index 27df4669a..ea88ae8a8 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -88,8 +88,8 @@ grub_net_link_layer_add_address (struct grub_net_card *card,
|
|
/* Add sender to cache table. */
|
|
if (card->link_layer_table == NULL)
|
|
{
|
|
- card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE
|
|
- * sizeof (card->link_layer_table[0]));
|
|
+ card->link_layer_table = grub_calloc (LINK_LAYER_CACHE_SIZE,
|
|
+ sizeof (card->link_layer_table[0]));
|
|
if (card->link_layer_table == NULL)
|
|
return;
|
|
}
|
|
--
|
|
2.50.1
|
|
|