| Message ID | 302d0737539daa2053134e8f24fdf37e3d939e1e.1657788997.git.geert@linux-m68k.org |
|---|---|
| State | New |
| Headers | show |
| Series | drm/modes: Command line mode selection fixes and improvements | expand |
Hi, On Thu, Jul 14, 2022 at 11:04:06AM +0200, Geert Uytterhoeven wrote: > If no mode name part was specified, mode_end is zero, and the "ret == > mode_end" check does the wrong thing. > > Fix this by skipping all named mode handling when mode_end is zero. > > Fixes: 7b1cce760afe38b4 ("drm/modes: parse_cmdline: Allow specifying stand-alone options") > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> We should add a test for that in drivers/gpu/drm/tests/drm_cmdline_parser_test.c Maxime
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 14b746f7ba975954..67773740c74c9ba0 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1823,7 +1823,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, } /* First check for a named mode */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { + for (i = 0; mode_end && i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { ret = str_has_prefix(name, drm_named_modes_whitelist[i]); if (ret == mode_end) { if (refresh_ptr)
If no mode name part was specified, mode_end is zero, and the "ret == mode_end" check does the wrong thing. Fix this by skipping all named mode handling when mode_end is zero. Fixes: 7b1cce760afe38b4 ("drm/modes: parse_cmdline: Allow specifying stand-alone options") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> --- v2: - Add Reviewed-by, Acked-by, - Keep "ret == mode_end" check. --- drivers/gpu/drm/drm_modes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)