Skip to content

Commit 4a4bac8

Browse files
samasth-norwaygregkh
authored andcommitted
fbcon: fix integer overflow in fbcon_do_set_font
commit 1a194e6 upstream. 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] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 910d774 commit 4a4bac8

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
@@ -2519,9 +2519,16 @@ static int fbcon_set_font(struct vc_data *vc, const struct console_font *font,
25192519
if (fbcon_invalid_charcount(info, charcount))
25202520
return -EINVAL;
25212521

2522-
size = CALC_FONTSZ(h, pitch, charcount);
2522+
/* Check for integer overflow in font size calculation */
2523+
if (check_mul_overflow(h, pitch, &size) ||
2524+
check_mul_overflow(size, charcount, &size))
2525+
return -EINVAL;
2526+
2527+
/* Check for overflow in allocation size calculation */
2528+
if (check_add_overflow(FONT_EXTRA_WORDS * sizeof(int), size, &size))
2529+
return -EINVAL;
25232530

2524-
new_data = kmalloc(FONT_EXTRA_WORDS * sizeof(int) + size, GFP_USER);
2531+
new_data = kmalloc(size, GFP_USER);
25252532

25262533
if (!new_data)
25272534
return -ENOMEM;

0 commit comments

Comments
 (0)