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

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
...@@ -1316,6 +1316,9 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font) ...@@ -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, static int vgacon_resize(struct vc_data *c, unsigned int width,
unsigned int height, unsigned int user) unsigned int height, unsigned int user)
{ {
if ((width << 1) * height > vga_vram_size)
return -EINVAL;
if (width % 2 || width > screen_info.orig_video_cols || if (width % 2 || width > screen_info.orig_video_cols ||
height > (screen_info.orig_video_lines * vga_default_font_height)/ height > (screen_info.orig_video_lines * vga_default_font_height)/
c->vc_font.height) c->vc_font.height)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment