Commit 2b09d5d
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
1 file changed
+5
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2495 | 2495 | | |
2496 | 2496 | | |
2497 | 2497 | | |
| 2498 | + | |
| 2499 | + | |
| 2500 | + | |
2498 | 2501 | | |
2499 | | - | |
2500 | | - | |
| 2502 | + | |
| 2503 | + | |
2501 | 2504 | | |
2502 | 2505 | | |
2503 | 2506 | | |
| |||
0 commit comments