Commit 2f501bb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-03-06-1' of git://anongit.freedesktop.org/drm/drm 

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
parents 30fe0d07 513dc792

drivers/video/console/vgacon.c

+3 −0
Original line number Diff line number Diff line
@@ -1316,6 +1316,9 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font) 
static int vgacon_resize(struct vc_data *c, unsigned int width,

			 unsigned int height, unsigned int user)

{

	if ((width << 1) * height > vga_vram_size)

		return -EINVAL;



	if (width % 2 || width > screen_info.orig_video_cols ||

	    height > (screen_info.orig_video_lines * vga_default_font_height)/

	    c->vc_font.height)

CRA Git | Maintained and supported by SUSTech CRA and CCSE