From patchwork Thu Jul 14 09:04:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 12917697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18D18C433EF for ; Thu, 14 Jul 2022 10:39:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A028A4508; Thu, 14 Jul 2022 10:39:08 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07792A3446 for ; Thu, 14 Jul 2022 10:39:02 +0000 (UTC) Received: from ramsan.of.borg ([84.195.186.194]) by albert.telenet-ops.be with bizsmtp id uyez2700L4C55Sk06yezsT; Thu, 14 Jul 2022 12:39:01 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1oBvwx-003The-8p; Thu, 14 Jul 2022 12:20:03 +0200 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1oBulZ-00Bf1F-Go; Thu, 14 Jul 2022 11:04:13 +0200 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v2 1/5] drm/modes: parse_cmdline: Handle empty mode name part Date: Thu, 14 Jul 2022 11:04:06 +0200 Message-Id: <302d0737539daa2053134e8f24fdf37e3d939e1e.1657788997.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Geert Uytterhoeven , linux-m68k@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Reviewed-by: Hans de Goede Acked-by: Thomas Zimmermann --- 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(-) 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)