diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
| commit | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (patch) | |
| tree | ff0a388af912d9a20635ea8bae6f82e660dcf427 /drivers/tty/vt/vt.c | |
| parent | 0a2aefa1f71da3bb10634918c68f6fb0068c1052 (diff) | |
| parent | 8576fa45c10e665bb72931a31461c7310f3c5494 (diff) | |
Merge tag 'v4.1.36' into linux-linaro-lsk-v4.1lsk-v4.1-16.12
This is the 4.1.36 stable release
Diffstat (limited to 'drivers/tty/vt/vt.c')
| -rw-r--r-- | drivers/tty/vt/vt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index ba86956ef4b5..2df90a54509a 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -865,10 +865,15 @@ 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; + if (vc == sel_cons) + clear_selection(); + old_rows = vc->vc_rows; old_row_size = vc->vc_size_row; |