6243ccd337
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>
(cherry picked from commit ded3e0045a)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
94 lines
2.7 KiB
Diff
94 lines
2.7 KiB
Diff
From 883c8721591c1f7a186e2f3cdc8a4f140bd81ce9 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Fri, 1 Nov 2024 23:49:48 +0000
|
|
Subject: [PATCH] net: Remove variables hooks when interface is unregisted
|
|
|
|
The grub_net_network_level_interface_unregister(), previously
|
|
implemented in a header, did not remove the variables hooks that
|
|
were registered in grub_net_network_level_interface_register().
|
|
Fix this by implementing the same logic used to register the
|
|
variables and move the function into the grub-core/net/net.c.
|
|
|
|
Signed-off-by: B Horn <b@horn.uk>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
Conflicts:
|
|
grub-core/net/net.c
|
|
|
|
Upstream: aa8b4d7facef7b75a2703274b1b9d4e0e734c401
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
grub-core/net/net.c | 33 +++++++++++++++++++++++++++++++++
|
|
include/grub/net.h | 11 +----------
|
|
2 files changed, 34 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index f69c67b64..8dbb0eada 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -1094,6 +1094,39 @@ grub_cmd_delroute (struct grub_command *cmd __attribute__ ((unused)),
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
+void
|
|
+grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
|
|
+{
|
|
+ char *name;
|
|
+
|
|
+ {
|
|
+ char buf[GRUB_NET_MAX_STR_HWADDR_LEN];
|
|
+
|
|
+ grub_net_hwaddr_to_str (&inter->hwaddress, buf);
|
|
+ name = grub_xasprintf ("net_%s_mac", inter->name);
|
|
+ if (name != NULL)
|
|
+ grub_register_variable_hook (name, NULL, NULL);
|
|
+ grub_free (name);
|
|
+ }
|
|
+
|
|
+ {
|
|
+ char buf[GRUB_NET_MAX_STR_ADDR_LEN];
|
|
+
|
|
+ grub_net_addr_to_str (&inter->address, buf);
|
|
+ name = grub_xasprintf ("net_%s_ip", inter->name);
|
|
+ if (name != NULL)
|
|
+ grub_register_variable_hook (name, NULL, NULL);
|
|
+ grub_free (name);
|
|
+ }
|
|
+
|
|
+ inter->card->num_ifaces--;
|
|
+ *inter->prev = inter->next;
|
|
+ if (inter->next)
|
|
+ inter->next->prev = inter->prev;
|
|
+ inter->next = 0;
|
|
+ inter->prev = 0;
|
|
+}
|
|
+
|
|
grub_err_t
|
|
grub_net_add_route (const char *name,
|
|
grub_net_network_level_netaddress_t target,
|
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
|
index 844e501c1..228d04963 100644
|
|
--- a/include/grub/net.h
|
|
+++ b/include/grub/net.h
|
|
@@ -540,16 +540,7 @@ void grub_bootp_fini (void);
|
|
void grub_dns_init (void);
|
|
void grub_dns_fini (void);
|
|
|
|
-static inline void
|
|
-grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
|
|
-{
|
|
- inter->card->num_ifaces--;
|
|
- *inter->prev = inter->next;
|
|
- if (inter->next)
|
|
- inter->next->prev = inter->prev;
|
|
- inter->next = 0;
|
|
- inter->prev = 0;
|
|
-}
|
|
+void grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter);
|
|
|
|
void
|
|
grub_net_tcp_retransmit (void);
|
|
--
|
|
2.50.1
|
|
|