From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4A45C43460 for ; Mon, 5 Apr 2021 16:25:18 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A3C261394 for ; Mon, 5 Apr 2021 16:25:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A3C261394 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3rGA+mpszA1vwrMkH4LfFS6OF7iCMBq/QXLZXNJcj8s=; b=ViGDGkI+LAl/dZ7D0T6+KnJWh qwXhJOTHMMwAC38mQJ50vLMFTklAFiSAQAzAg99XAY/3Ocbw6NgVS/QfsnnHV6lCLT/nkeQxkQAF8 /zuqTxEBFQrBoKnT9LO45Swx9GCh8xrCn3FcdgTokzmDYCQVAjNf2OjjAI8/2EQaKANH4FEgolm4b Ff3+MS6q5Vlly0Qg3wKWVoTTh6WfDz1e/AFyW28FKSuEb7/FTYCvt9knY1oMcoE1LLU+lHW0JdW7/ Dnrs542uH9I/drVgaX/8XA2Bb8H3CC8ltR8k7DUsvkLK/sXY9UG6bmbyzu9oObv+5ydWiXCfsMQAQ m74sZB23w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lTS16-0005XZ-6L; Mon, 05 Apr 2021 16:23:56 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lTS12-0005VR-EO for linux-arm-kernel@desiato.infradead.org; Mon, 05 Apr 2021 16:23:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=XkPdNVaNQcSy6cEWQ8rO6MjXPFYgkoQL1AcvqptpAz4=; b=cnk8pLRm6ji+J5LHXbxoIZWeil m9sKDPFqDOHv/0aZfKrTYZjztIycW5y24q8B9Eqhh9rDWe+a2aEJmrCHjz7krATx74g2JbzBYIs3d hcHaC1PjwNJoc8kkqnZNbvqzE72+qMoP0ABrt4mezeWrxXK92ofNANXdXGllg+KsPhSH0TUWt2AGp 3J5HWBjojUlEKiC4QpGJ5jd3gXzKiPjSa+g8/jSSEh/sZpF5TdS8VQgD77yCM8HG+pSaWwfPuE+/R vFm6v0FFX7pHL0r3migcuey/kCqBtEmIO0UcWpISFVAwihm9qH2Dlv1x+PnB64Tlw0wBpxxFYuUiG 9EX9xTMA==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lTRjq-00BZx2-6j for linux-arm-kernel@lists.infradead.org; Mon, 05 Apr 2021 16:06:38 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8AB2F613F1; Mon, 5 Apr 2021 16:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617638720; bh=/OqoiyF58eJ1ZX2Sbi4gzBwj/jNfSytLlR1vYZznEso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EFZPrhaPqFE9tsZl7iK3Yqs7aRKH+zStMlnvj8xP2DS2Sa/fU1tvbP5MDwh0n+G0M lVyr/8+k8XDmOGG1TtVn+iNLIRmgzp8LG+0q/Xt3sX+vb/Qf+gtKZRuu516LxxrMSI lSkhddTOoE5kYaXwsVLrXZ8JbKL+aATCadQnHZkGCbFKlm1nb1Yexm2k3raKVwx+Zw RlvYJdxviGzVArE2AZWDBzlyn7v8116ykZ2hHm7DjEqWZZd4b/l52ahgYGSP7C7pRn CvlN+f76rAlaYjVqtdZkmre6Eb3v1Uoxn6vF8FEbvaj7JWeqsdwnHcj2fMV9j2UHIB +Z7I9yomtI3eg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Liu Ying , Philipp Zabel , Sasha Levin , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 3/8] drm/imx: imx-ldb: fix out of bounds array access warning Date: Mon, 5 Apr 2021 12:05:10 -0400 Message-Id: <20210405160515.269020-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210405160515.269020-1-sashal@kernel.org> References: <20210405160515.269020-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210405_170628_613982_BFFF09C7 X-CRM114-Status: GOOD ( 12.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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(+) diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 221a8cbc57f9..a4dba034dca4 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -206,6 +206,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) { @@ -264,6 +269,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__); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel