]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tty: limit terminal size to 4M chars
authorDmitry Vyukov <dvyukov@google.com>
Fri, 14 Oct 2016 13:18:28 +0000 (15:18 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 24 Nov 2016 15:23:23 +0000 (16:23 +0100)
commit 32b2921e6a7461fe63b71217067a6cf4bddb132f upstream.

Size of kmalloc() in vc_do_resize() is controlled by user.
Too large kmalloc() size triggers WARNING message on console.
Put a reasonable upper bound on terminal size to prevent WARNINGs.

Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
CC: David Rientjes <rientjes@google.com>
Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: linux-kernel@vger.kernel.org
Cc: syzkaller@googlegroups.com
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/tty/vt/vt.c

index d52e653076f43490422a6bdd28f4a10e39c92029..60ce423c6364587d335b018c5e601b4fa5fbbf92 100644 (file)
@@ -863,6 +863,8 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
        if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
                return 0;
 
+       if (new_screen_size > (4 << 20))
+               return -EINVAL;
        newscreen = kmalloc(new_screen_size, GFP_USER);
        if (!newscreen)
                return -ENOMEM;