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
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 5760fcfd466cc757540ea0d591bad6a08caeaa16 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Date: Wed, 3 Aug 2022 19:45:33 +0800
|
|
Subject: [PATCH 02/14] font: Reject glyphs exceeds font->max_glyph_width or
|
|
font->max_glyph_height
|
|
|
|
Check glyph's width and height against limits specified in font's
|
|
metadata. Reject the glyph (and font) if such limits are exceeded.
|
|
|
|
Signed-off-by: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/font/font.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
|
|
index 42189c325..756ca0abf 100644
|
|
--- a/grub-core/font/font.c
|
|
+++ b/grub-core/font/font.c
|
|
@@ -760,7 +760,9 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code)
|
|
|| read_be_uint16 (font->file, &height) != 0
|
|
|| read_be_int16 (font->file, &xoff) != 0
|
|
|| read_be_int16 (font->file, &yoff) != 0
|
|
- || read_be_int16 (font->file, &dwidth) != 0)
|
|
+ || read_be_int16 (font->file, &dwidth) != 0
|
|
+ || width > font->max_char_width
|
|
+ || height > font->max_char_height)
|
|
{
|
|
remove_font (font);
|
|
return 0;
|
|
--
|
|
2.30.2
|
|
|