forked from pool/grub2
fd4fd3a935
- Security fixes and hardenings * 0001-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch * 0002-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch - Fix CVE-2022-2601 (bsc#1205178) * 0003-font-Fix-several-integer-overflows-in-grub_font_cons.patch * 0004-font-Remove-grub_font_dup_glyph.patch * 0005-font-Fix-integer-overflow-in-ensure_comb_space.patch * 0006-font-Fix-integer-overflow-in-BMP-index.patch * 0007-font-Fix-integer-underflow-in-binary-search-of-char-.patch * 0008-fbutil-Fix-integer-overflow.patch - Fix CVE-2022-3775 (bsc#1205182) * 0009-font-Fix-an-integer-underflow-in-blit_comb.patch * 0010-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch * 0011-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch * 0012-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch - Bump upstream SBAT generation to 3 OBS-URL: https://build.opensuse.org/request/show/1035936 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=426
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From bcda6538ffeb516987a1921fbe533aaf8b8c981b Mon Sep 17 00:00:00 2001
|
|
From: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Date: Fri, 28 Oct 2022 17:29:16 +0800
|
|
Subject: [PATCH 11/12] font: Assign null_font to glyphs in ascii_font_glyph[]
|
|
|
|
The calculations in blit_comb() need information from glyph's font, e.g.
|
|
grub_font_get_xheight(main_glyph->font). However, main_glyph->font is
|
|
NULL if main_glyph comes from ascii_font_glyph[]. Therefore
|
|
grub_font_get_*() crashes because of NULL pointer.
|
|
|
|
There is already a solution, the null_font. So, assign it to those glyphs
|
|
in ascii_font_glyph[].
|
|
|
|
Reported-by: Daniel Axtens <dja@axtens.net>
|
|
Signed-off-by: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/font/font.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
|
|
index 29fbb9429..e6616e610 100644
|
|
--- a/grub-core/font/font.c
|
|
+++ b/grub-core/font/font.c
|
|
@@ -137,7 +137,7 @@ ascii_glyph_lookup (grub_uint32_t code)
|
|
ascii_font_glyph[current]->offset_x = 0;
|
|
ascii_font_glyph[current]->offset_y = -2;
|
|
ascii_font_glyph[current]->device_width = 8;
|
|
- ascii_font_glyph[current]->font = NULL;
|
|
+ ascii_font_glyph[current]->font = &null_font;
|
|
|
|
grub_memcpy (ascii_font_glyph[current]->bitmap,
|
|
&ascii_bitmaps[current * ASCII_BITMAP_SIZE],
|
|
--
|
|
2.35.3
|
|
|