提交 1d43dc2c 编写于 作者: H Helge Deller 提交者: Zheng Zengkai

fbcon: Fix boundary checks for fbcon=vc:n1-n2 parameters

stable inclusion
from stable-v5.10.137
commit 16badd9987360218291a7623827ec9576007ab5f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=16badd9987360218291a7623827ec9576007ab5f

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

commit cad564ca upstream.

The user may use the fbcon=vc:<n1>-<n2> option to tell fbcon to take
over the given range (n1...n2) of consoles. The value for n1 and n2
needs to be a positive number and up to (MAX_NR_CONSOLES - 1).
The given values were not fully checked against those boundaries yet.

To fix the issue, convert first_fb_vc and last_fb_vc to unsigned
integers and check them against the upper boundary, and make sure that
first_fb_vc is smaller than last_fb_vc.

Cc: stable@vger.kernel.org # v4.19+
Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NHelge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YpkYRMojilrtZIgM@p100Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 d97676cf
...@@ -123,8 +123,8 @@ static int logo_lines; ...@@ -123,8 +123,8 @@ static int logo_lines;
enums. */ enums. */
static int logo_shown = FBCON_LOGO_CANSHOW; static int logo_shown = FBCON_LOGO_CANSHOW;
/* console mappings */ /* console mappings */
static int first_fb_vc; static unsigned int first_fb_vc;
static int last_fb_vc = MAX_NR_CONSOLES - 1; static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1;
static int fbcon_is_default = 1; static int fbcon_is_default = 1;
static int primary_device = -1; static int primary_device = -1;
static int fbcon_has_console_bind; static int fbcon_has_console_bind;
...@@ -472,10 +472,12 @@ static int __init fb_console_setup(char *this_opt) ...@@ -472,10 +472,12 @@ static int __init fb_console_setup(char *this_opt)
options += 3; options += 3;
if (*options) if (*options)
first_fb_vc = simple_strtoul(options, &options, 10) - 1; first_fb_vc = simple_strtoul(options, &options, 10) - 1;
if (first_fb_vc < 0) if (first_fb_vc >= MAX_NR_CONSOLES)
first_fb_vc = 0; first_fb_vc = 0;
if (*options++ == '-') if (*options++ == '-')
last_fb_vc = simple_strtoul(options, &options, 10) - 1; last_fb_vc = simple_strtoul(options, &options, 10) - 1;
if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES)
last_fb_vc = MAX_NR_CONSOLES - 1;
fbcon_is_default = 0; fbcon_is_default = 0;
continue; continue;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册