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
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From a2606b0cb95f261288c79cafc7295927d868cb04 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 01/12] 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 d09bb38d8..2f09a4a55 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.35.3
|
|
|