Skip to content

Commit 2b09d5d

Browse files
sthibaulhdeller
authored andcommitted
fbcon: Check font dimension limits
blit_x and blit_y are u32, so fbcon currently cannot support fonts larger than 32x32. The 32x32 case also needs shifting an unsigned int, to properly set bit 31, otherwise we get "UBSAN: shift-out-of-bounds in fbcon_set_font", as reported on: http://lore.kernel.org/all/IA1PR07MB98308653E259A6F2CE94A4AFABCE9@IA1PR07MB9830.namprd07.prod.outlook.com Kernel Branch: 6.2.0-rc5-next-20230124 Kernel config: https://drive.google.com/file/d/1F-LszDAizEEH0ZX0HcSR06v5q8FPl2Uv/view?usp=sharing Reproducer: https://drive.google.com/file/d/1mP1jcLBY7vWCNM60OMf-ogw-urQRjNrm/view?usp=sharing Reported-by: Sanan Hasanov <[email protected]> Signed-off-by: Samuel Thibault <[email protected]> Fixes: 2d2699d ("fbcon: font setting should check limitation of driver") Cc: [email protected] Tested-by: Miko Larsson <[email protected]> Reviewed-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent ee9fffd commit 2b09d5d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/video/fbdev/core/fbcon.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,9 +2495,12 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font,
24952495
h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres))
24962496
return -EINVAL;
24972497

2498+
if (font->width > 32 || font->height > 32)
2499+
return -EINVAL;
2500+
24982501
/* Make sure drawing engine can handle the font */
2499-
if (!(info->pixmap.blit_x & (1 << (font->width - 1))) ||
2500-
!(info->pixmap.blit_y & (1 << (font->height - 1))))
2502+
if (!(info->pixmap.blit_x & BIT(font->width - 1)) ||
2503+
!(info->pixmap.blit_y & BIT(font->height - 1)))
25012504
return -EINVAL;
25022505

25032506
/* Make sure driver can handle the font length */

0 commit comments

Comments
 (0)