summaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-03-30 13:31:37 +0200
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2020-03-30 13:31:37 +0200
commitba15533275dd70238b523417d222d43fb40dac9d (patch)
treee97f6b804994d20ce476dc5a123fc074799e9584 /drivers/video/console
parentMIPS: ralink: mt7621: Fix soc_device introduction (diff)
parentLinux 5.6 (diff)
downloadlinux-ba15533275dd70238b523417d222d43fb40dac9d.tar.xz
linux-ba15533275dd70238b523417d222d43fb40dac9d.zip
Merge tag 'v5.6' into mips-next
Linux 5.6
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/vgacon.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index de7b8382aba9..998b0de1812f 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -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)