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>
71 lines
2.0 KiB
Diff
71 lines
2.0 KiB
Diff
From 67241595d3dae392589ee74b65cd40ea090d1837 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Sat, 15 Jun 2024 02:33:08 +0100
|
|
Subject: [PATCH] misc: Implement grub_strlcpy()
|
|
|
|
grub_strlcpy() acts the same way as strlcpy() does on most *NIX,
|
|
returning the length of src and ensuring dest is always NUL
|
|
terminated except when size is 0.
|
|
|
|
Signed-off-by: B Horn <b@horn.uk>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Upstream: ea703528a8581a2ea7e0bad424a70fdf0aec7d8f
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
include/grub/misc.h | 39 +++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 39 insertions(+)
|
|
|
|
diff --git a/include/grub/misc.h b/include/grub/misc.h
|
|
index 1b35a167f..103175480 100644
|
|
--- a/include/grub/misc.h
|
|
+++ b/include/grub/misc.h
|
|
@@ -64,6 +64,45 @@ grub_stpcpy (char *dest, const char *src)
|
|
return d - 1;
|
|
}
|
|
|
|
+static inline grub_size_t
|
|
+grub_strlcpy (char *dest, const char *src, grub_size_t size)
|
|
+{
|
|
+ char *d = dest;
|
|
+ grub_size_t res = 0;
|
|
+ /*
|
|
+ * We do not subtract one from size here to avoid dealing with underflowing
|
|
+ * the value, which is why to_copy is always checked to be greater than one
|
|
+ * throughout this function.
|
|
+ */
|
|
+ grub_size_t to_copy = size;
|
|
+
|
|
+ /* Copy size - 1 bytes to dest. */
|
|
+ if (to_copy > 1)
|
|
+ while ((*d++ = *src++) != '\0' && ++res && --to_copy > 1)
|
|
+ ;
|
|
+
|
|
+ /*
|
|
+ * NUL terminate if size != 0. The previous step may have copied a NUL byte
|
|
+ * if it reached the end of the string, but we know dest[size - 1] must always
|
|
+ * be a NUL byte.
|
|
+ */
|
|
+ if (size != 0)
|
|
+ dest[size - 1] = '\0';
|
|
+
|
|
+ /* If there is still space in dest, but are here, we reached the end of src. */
|
|
+ if (to_copy > 1)
|
|
+ return res;
|
|
+
|
|
+ /*
|
|
+ * If we haven't reached the end of the string, iterate through to determine
|
|
+ * the strings total length.
|
|
+ */
|
|
+ while (*src++ != '\0' && ++res)
|
|
+ ;
|
|
+
|
|
+ return res;
|
|
+}
|
|
+
|
|
/* XXX: If grub_memmove is too slow, we must implement grub_memcpy. */
|
|
static inline void *
|
|
grub_memcpy (void *dest, const void *src, grub_size_t n)
|
|
--
|
|
2.50.1
|
|
|