Re: [PATCH] drm/imx: fix out of bounds array access warning
From: Joe Perches <joe@perches.com>
Date: 2021-03-23 14:19:58
Also in:
dri-devel, lkml
On Tue, 2021-03-23 at 14:05 +0100, Arnd Bergmann wrote:
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.
[]
quoted hunk ↗ jump to hunk
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
[]
quoted hunk ↗ jump to hunk
@@ -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) { + dev_warn(ldb->dev, + "%s: invalid mux\n", __func__);
trivia: Any real reason to make this 2 lines? It fits nicely in 80 chars. Maybe: dev_warn(ldb->dev, "%s: invalid mux: %d\n", __func__, mux); or maybe: dev_warn(ldb->dev, "%s: invalid mux: %pe\n", __func__, ERR_PTR(mux));
quoted hunk ↗ jump to hunk
@@ -255,6 +261,12 @@ imx_ldb_encoder_atomic_mode_set(struct drm_encoder *encoder,
[]
+ if (mux < 0) {
+ dev_warn(ldb->dev,
+ "%s: invalid mux\n", __func__);etc... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel