All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [v2] drm/imx: imx-ldb: fix out of bounds array access warning
@ 2021-03-24 12:17 ` Arnd Bergmann
  0 siblings, 0 replies; 36+ messages in thread
From: Arnd Bergmann @ 2021-03-24 12:17 UTC (permalink / raw)
  To: Philipp Zabel, David Airlie, Daniel Vetter
  Cc: Arnd Bergmann, Shawn Guo, Sascha Hauer, Pengutronix Kernel Team,
	Fabio Estevam, NXP Linux Team, Marco Felsch, Laurent Pinchart,
	Joe Perches, Liu Ying, dri-devel, linux-arm-kernel, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>

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 <arnd@arndb.de>
---
v2: fix subject line
    expand patch description
    print mux number
    check upper bound as well
---
 drivers/gpu/drm/imx/imx-ldb.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index dbfe39e2f7f6..40310327fa76 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -197,6 +197,12 @@ 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__, ERR_PTR(mux));
+		return;
+	}
+
 	drm_panel_prepare(imx_ldb_ch->panel);
 
 	if (dual) {
@@ -255,6 +261,12 @@ 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__, ERR_PTR(mux));
+		return;
+	}
+
 	if (mode->clock > 170000) {
 		dev_warn(ldb->dev,
 			 "%s: mode exceeds 170 MHz pixel clock\n", __func__);
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2021-03-24 22:48 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-24 12:17 [PATCH] [v2] drm/imx: imx-ldb: fix out of bounds array access warning Arnd Bergmann
2021-03-24 12:17 ` Arnd Bergmann
2021-03-24 12:17 ` Arnd Bergmann
2021-03-24 14:20 ` Joe Perches
2021-03-24 14:20   ` Joe Perches
2021-03-24 14:20   ` Joe Perches
2021-03-24 16:42   ` Arnd Bergmann
2021-03-24 16:42     ` Arnd Bergmann
2021-03-24 16:42     ` Arnd Bergmann
2021-03-24 16:52     ` Joe Perches
2021-03-24 16:52       ` Joe Perches
2021-03-24 16:52       ` Joe Perches
2021-03-24 17:20       ` [RFC patch] vsprintf: Allow %pe to print non PTR_ERR %pe uses as decimal Joe Perches
2021-03-24 17:20         ` Joe Perches
2021-03-24 17:20         ` Joe Perches
2021-03-24 17:33         ` Rasmus Villemoes
2021-03-24 17:33           ` Rasmus Villemoes
2021-03-24 17:33           ` Rasmus Villemoes
2021-03-24 19:24           ` Joe Perches
2021-03-24 19:24             ` Joe Perches
2021-03-24 19:24             ` Joe Perches
2021-03-24 21:27             ` Rasmus Villemoes
2021-03-24 21:27               ` Rasmus Villemoes
2021-03-24 21:27               ` Rasmus Villemoes
2021-03-24 22:18               ` Joe Perches
2021-03-24 22:18                 ` Joe Perches
2021-03-24 22:18                 ` Joe Perches
2021-03-24 22:36                 ` Rasmus Villemoes
2021-03-24 22:36                   ` Rasmus Villemoes
2021-03-24 22:36                   ` Rasmus Villemoes
2021-03-24 22:46                   ` Joe Perches
2021-03-24 22:46                     ` Joe Perches
2021-03-24 22:46                     ` Joe Perches
2021-03-24 16:14 ` [PATCH] [v2] drm/imx: imx-ldb: fix out of bounds array access warning kernel test robot
2021-03-24 16:14   ` kernel test robot
2021-03-24 16:14   ` kernel test robot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.