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
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 2ec7e27b2cac3746f2e658042fd56fe75fee28f2 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Date: Fri, 5 Aug 2022 02:27:05 +0800
|
|
Subject: [PATCH 05/12] font: Fix integer overflow in ensure_comb_space()
|
|
|
|
In fact it can't overflow at all because glyph_id->ncomb is only 8-bit
|
|
wide. But let's keep safe if somebody changes the width of glyph_id->ncomb
|
|
in the future. This patch also fixes the inconsistency between
|
|
render_max_comb_glyphs and render_combining_glyphs when grub_malloc()
|
|
returns NULL.
|
|
|
|
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, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
|
|
index a115a63b0..d0e634040 100644
|
|
--- a/grub-core/font/font.c
|
|
+++ b/grub-core/font/font.c
|
|
@@ -1468,14 +1468,18 @@ ensure_comb_space (const struct grub_unicode_glyph *glyph_id)
|
|
if (glyph_id->ncomb <= render_max_comb_glyphs)
|
|
return;
|
|
|
|
- render_max_comb_glyphs = 2 * glyph_id->ncomb;
|
|
- if (render_max_comb_glyphs < 8)
|
|
+ if (grub_mul (glyph_id->ncomb, 2, &render_max_comb_glyphs))
|
|
+ render_max_comb_glyphs = 0;
|
|
+ if (render_max_comb_glyphs > 0 && render_max_comb_glyphs < 8)
|
|
render_max_comb_glyphs = 8;
|
|
grub_free (render_combining_glyphs);
|
|
- render_combining_glyphs = grub_malloc (render_max_comb_glyphs
|
|
- * sizeof (render_combining_glyphs[0]));
|
|
+ render_combining_glyphs = (render_max_comb_glyphs > 0) ?
|
|
+ grub_calloc (render_max_comb_glyphs, sizeof (render_combining_glyphs[0])) : NULL;
|
|
if (!render_combining_glyphs)
|
|
- grub_errno = 0;
|
|
+ {
|
|
+ render_max_comb_glyphs = 0;
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+ }
|
|
}
|
|
|
|
int
|
|
--
|
|
2.35.3
|
|
|