Pull vgacon fix from Daniel Vetter: "One vgacon input check for stable" * tag 'drm-fixes-2020-03-06-1' of git://anongit.freedesktop.org/drm/drm: vgacon: Fix a UAF in vgacon_invert_region
Unified · Split
| @@ -1316,6 +1316,9 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font) · 1315 unmodified lines | |||
| 1316 | static int vgacon_resize(struct vc_data *c, unsigned int width, | 1316 | static int vgacon_resize(struct vc_data *c, unsigned int width, |
| 1317 | unsigned int height, unsigned int user) | 1317 | unsigned int height, unsigned int user) |
| 1318 | { | 1318 | { |
| 1319 | if ((width << 1) * height > vga_vram_size) | ||
| 1320 | return -EINVAL; | ||
| 1321 | |||
| 1319 | if (width % 2 || width > screen_info.orig_video_cols || | 1322 | if (width % 2 || width > screen_info.orig_video_cols || |
| 1320 | height > (screen_info.orig_video_lines * vga_default_font_height)/ | 1323 | height > (screen_info.orig_video_lines * vga_default_font_height)/ |
| 1321 | c->vc_font.height) | 1324 | c->vc_font.height) |