d10d6fb187
Porting patches from grub2_2.06-3~deb11u4 to fix CVE-2022-2601/CVE-2022-3775. The source code of grub2_2.06-3~deb11u4 is from: https://snapshot.debian.org/archive/debian/20221124T030451Z/ pool/main/g/grub2/grub2_2.06-3~deb11u4.debian.tar.xz Refer to above source code and this link for the fix: https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00059.html The 1st patch in the list is for making proper context for the 14 patches of the 2 CVEs. No content changes for all the patches from debian release. We do this because grub2/grub-efi is ported from wrlinux for secure boot bringing up. Test plan: - PASS: build grub2/grub-efi. - PASS: build-image and install and boot up on lab/qemu. - PASS: check that the "stx.N" version number is right for both bios(grub2 ver) and uefi(grub-efi ver) boot. Closes-bug: 2020730 Signed-off-by: Li Zhou <li.zhou@windriver.com> Change-Id: Ia6c58a2021a786ef92f760b3cfe035fbccedacf7
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 25ad31c19c331aaa2dbd9bd2b2e2655de5766a9d Mon Sep 17 00:00:00 2001
|
|
From: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Date: Fri, 5 Aug 2022 02:13:29 +0800
|
|
Subject: [PATCH 05/14] font: Remove grub_font_dup_glyph()
|
|
|
|
Remove grub_font_dup_glyph() since nobody is using it since 2013, and
|
|
I'm too lazy to fix the integer overflow problem in it.
|
|
|
|
Signed-off-by: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/font/font.c | 14 --------------
|
|
1 file changed, 14 deletions(-)
|
|
|
|
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
|
|
index e6548892f..a8576ffec 100644
|
|
--- a/grub-core/font/font.c
|
|
+++ b/grub-core/font/font.c
|
|
@@ -1055,20 +1055,6 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
|
|
return best_glyph;
|
|
}
|
|
|
|
-#if 0
|
|
-static struct grub_font_glyph *
|
|
-grub_font_dup_glyph (struct grub_font_glyph *glyph)
|
|
-{
|
|
- static struct grub_font_glyph *ret;
|
|
- ret = grub_malloc (sizeof (*ret) + (glyph->width * glyph->height + 7) / 8);
|
|
- if (!ret)
|
|
- return NULL;
|
|
- grub_memcpy (ret, glyph, sizeof (*ret)
|
|
- + (glyph->width * glyph->height + 7) / 8);
|
|
- return ret;
|
|
-}
|
|
-#endif
|
|
-
|
|
/* FIXME: suboptimal. */
|
|
static void
|
|
grub_font_blit_glyph (struct grub_font_glyph *target,
|
|
--
|
|
2.30.2
|
|
|