From patchwork Thu Apr 15 14:47:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 421789 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp554923jaf; Thu, 15 Apr 2021 08:02:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJWjRYH+BZqAfRYF9vMLlihlUqfcAS8omp7BS94qoOo7X/rt1XzGACPg7J/+ylPUPAXgh+ X-Received: by 2002:a17:902:c407:b029:e7:2272:d12e with SMTP id k7-20020a170902c407b02900e72272d12emr4131303plk.52.1618498967861; Thu, 15 Apr 2021 08:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618498967; cv=none; d=google.com; s=arc-20160816; b=AWvzc+QqrS60avaLs+tEGbfAstrKNg4EzI/QfCfBhlxPHqIfwKiKZxZ4nCfbztbDM2 8nc+0FH4sXriKFPnzY03LlLbyAuB8IysjRjL6WJfqIwbbybxJEWVh0PPFVg4pjFzGlln BwXqeQn9BWl48LAWqbaO9/laLF1OTBAk8lbjJpzMZHuSb3jzIMM5lLdXsxPWeHqy6vn5 pb6w/efDt0EWU0y9C3ZEjQRQvOmgca8B6X16j87NSaq5FrUpyWetorcl1JBklanNSeZE pd76V2ZxPuX9ziidLYHRCmuapRKhwed2il7EZeWvECGwFSNoJPcER5hwKc7pHo59XCI8 Vfig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=78EEIepg132EohyMleXPqaFYVMJ1bsOr80svfvL6SBw=; b=hqIKabfrHESfTUcl5MCYAZVz4SVaVz+h0//GnynrQZE6Caa6KXIc2I7hXq8NSp592c LQoWdcSu4pkvRJqAUiMi4qAuFAXP3tKmLMCywH91y3vjUf4hZozq6eL3a76cT0Kvec+U clGAXDCsZsACxMTx9r48eYYxcuPSlaDUxnnI5e62eCjtGnkvt4DBDgGjxEbKFZJpUaNT zyWu02WwYw5AeB2IAgKTb7c0fkIMB1B7ezZWZTQVgefPVj3KebtSjLkorkoymJs8IcSx NxN01NPbLoEJoZAMK5/QI+PPDCH5slALnRLsJ6o6nT55cNO0nZTfMgKXtBacWuNqZci5 nF4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="KA/OaYoU"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gc4si3443688pjb.46.2021.04.15.08.02.47; Thu, 15 Apr 2021 08:02:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="KA/OaYoU"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234333AbhDOPDD (ORCPT + 12 others); Thu, 15 Apr 2021 11:03:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:45924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235128AbhDOPAX (ORCPT ); Thu, 15 Apr 2021 11:00:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 53877613F3; Thu, 15 Apr 2021 14:56:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618498587; bh=lxjiYfaOWr/v12SmQ8SF17LZ0TNM0xbnrmvM/grhm1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KA/OaYoU2iPEFyr/0wmEA08HLsRA1rGJz0+eKital1BzFjMazuBz9ANyntQod3S1i BuriTgkgMh/pqOTZ5ALaSbp2fV4Zgmn6j/CYQh7VScXa3d5SKuW1eK15XnyBCH2Gwb DNo2i4Fn3274yoIaSFFvt9nYlzNgOF99j+TuY31s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Liu Ying , Philipp Zabel , Sasha Levin Subject: [PATCH 5.4 04/18] drm/imx: imx-ldb: fix out of bounds array access warning Date: Thu, 15 Apr 2021 16:47:57 +0200 Message-Id: <20210415144413.193686119@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210415144413.055232956@linuxfoundation.org> References: <20210415144413.055232956@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 33ce7f2f95cabb5834cf0906308a5cb6103976da ] When CONFIG_OF is disabled, building with 'make W=1' produces warnings about out of bounds array access: drivers/gpu/drm/imx/imx-ldb.c: In function 'imx_ldb_set_clock.constprop': drivers/gpu/drm/imx/imx-ldb.c:186:8: error: array subscript -22 is below array bounds of 'struct clk *[4]' [-Werror=array-bounds] Add an error check before the index is used, which helps with the warning, as well as any possible other error condition that may be triggered at runtime. The warning could be fixed by adding a Kconfig depedency on CONFIG_OF, but Liu Ying points out that the driver may hit the out-of-bounds problem at runtime anyway. Signed-off-by: Arnd Bergmann Reviewed-by: Liu Ying Signed-off-by: Philipp Zabel Signed-off-by: Sasha Levin --- drivers/gpu/drm/imx/imx-ldb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.30.2 diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index d6629fc869f3..116473c2360a 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -197,6 +197,11 @@ static void imx_ldb_encoder_enable(struct drm_encoder *encoder) int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder); + if (mux < 0 || mux >= ARRAY_SIZE(ldb->clk_sel)) { + dev_warn(ldb->dev, "%s: invalid mux %d\n", __func__, mux); + return; + } + drm_panel_prepare(imx_ldb_ch->panel); if (dual) { @@ -255,6 +260,11 @@ imx_ldb_encoder_atomic_mode_set(struct drm_encoder *encoder, int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder); u32 bus_format = imx_ldb_ch->bus_format; + if (mux < 0 || mux >= ARRAY_SIZE(ldb->clk_sel)) { + dev_warn(ldb->dev, "%s: invalid mux %d\n", __func__, mux); + return; + } + if (mode->clock > 170000) { dev_warn(ldb->dev, "%s: mode exceeds 170 MHz pixel clock\n", __func__);