]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit - drivers/video/fbdev/core/fbcon.c
fbcon: Fix option parsing control flow in fb_console_setup
authorMaarten ter Huurne <maarten@treewalker.org>
Thu, 9 Oct 2014 09:48:30 +0000 (11:48 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 22 Oct 2014 06:49:40 +0000 (09:49 +0300)
commit37773c4e7f6156c34d852c154ef7ce818867d521
tree301106d823588e76f87c94fef584fa0d72e018bf
parentf114040e3ea6e07372334ade75d1ee0775c355e1
fbcon: Fix option parsing control flow in fb_console_setup

Since strsep is used to tokenize the options string, after each option
match the code should use "continue" to get the next token from strsep.
This patch applies this pattern consistently.

Previously, for "scrollback:" and "map:" the parse code would return
(unconditionally: strsep ensures *options != ','), causing any
following option to be ignored, while for "vc:" the parse code would
go on to parse further options within the same token, which could lead
to invalid input being accepted.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Acked-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/console/fbcon.c