lkml.org 
[lkml]   [2017]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 171/306] tty: limit terminal size to 4M chars
    3.16.40-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dmitry Vyukov <dvyukov@google.com>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/tty/vt/vt.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/drivers/tty/vt/vt.c
    +++ b/drivers/tty/vt/vt.c
    @@ -863,6 +863,8 @@ static int vc_do_resize(struct tty_struc
    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;
    \
     
     \ /
      Last update: 2017-02-16 00:23    [W:3.469 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site