Skip to content

Commit 1a194e6

Browse files
samasth-norwaytdz
authored andcommitted
fbcon: fix integer overflow in fbcon_do_set_font
Fix integer overflow vulnerabilities in fbcon_do_set_font() where font size calculations could overflow when handling user-controlled font parameters. The vulnerabilities occur when: 1. CALC_FONTSZ(h, pitch, charcount) performs h * pith * charcount multiplication with user-controlled values that can overflow. 2. FONT_EXTRA_WORDS * sizeof(int) + size addition can also overflow 3. This results in smaller allocations than expected, leading to buffer overflows during font data copying. Add explicit overflow checking using check_mul_overflow() and check_add_overflow() kernel helpers to safety validate all size calculations before allocation. Signed-off-by: Samasth Norway Ananda <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Fixes: 39b3cff ("fbcon: prevent user font height or width change from causing potential out-of-bounds access") Cc: George Kennedy <[email protected]> Cc: stable <[email protected]> Cc: [email protected] Cc: Greg Kroah-Hartman <[email protected]> Cc: Simona Vetter <[email protected]> Cc: Helge Deller <[email protected]> Cc: Thomas Zimmermann <[email protected]> Cc: "Ville Syrjälä" <[email protected]> Cc: Sam Ravnborg <[email protected]> Cc: Qianqiang Liu <[email protected]> Cc: Shixiong Ou <[email protected]> Cc: Kees Cook <[email protected]> Cc: <[email protected]> # v5.9+ Signed-off-by: Thomas Zimmermann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 352e669 commit 1a194e6

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

drivers/video/fbdev/core/fbcon.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2531,9 +2531,16 @@ static int fbcon_set_font(struct vc_data *vc, const struct console_font *font,
25312531
if (fbcon_invalid_charcount(info, charcount))
25322532
return -EINVAL;
25332533

2534-
size = CALC_FONTSZ(h, pitch, charcount);
2534+
/* Check for integer overflow in font size calculation */
2535+
if (check_mul_overflow(h, pitch, &size) ||
2536+
check_mul_overflow(size, charcount, &size))
2537+
return -EINVAL;
2538+
2539+
/* Check for overflow in allocation size calculation */
2540+
if (check_add_overflow(FONT_EXTRA_WORDS * sizeof(int), size, &size))
2541+
return -EINVAL;
25352542

2536-
new_data = kmalloc(FONT_EXTRA_WORDS * sizeof(int) + size, GFP_USER);
2543+
new_data = kmalloc(size, GFP_USER);
25372544

25382545
if (!new_data)
25392546
return -ENOMEM;

0 commit comments

Comments
 (0)