gpu: ipu-v3: prg: avoid possible array underflow
Subsystems (2)
PATCH v3 1/1 gpu: ipu-v3: prg: avoid possible array underflow
gcc-8 reports that we access an array with a negative index in an error case:
drivers/gpu/ipu-v3/ipu-prg.c: In function 'ipu_prg_channel_disable':drivers/gpu/ipu-v3/ipu-prg.c:252:43: error: array subscript -22 is below array bounds of 'struct ipu_prg_channel[3]' [-Werror=array-bounds]
This moves the range check in front of the first time that variable gets used.
----
v1: Originally sent on Dec 4, 2017.
v2: Sent again on Jan 16, after no reply, Phillipp said it was merged
v3: Ran into a related problem with CONFIG_UBSAN, sent again fixing both
--- drivers/gpu/ipu-v3/ipu-prg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-prg.c +9 -3
@@ -250,10 +250,14 @@ void ipu_prg_channel_disable(struct ipuv3_channel *ipu_chan) {int prg_chan =ipu_prg_ipu_to_prg_chan (ipu_chan->num);struct ipu_prg *prg = ipu_chan->ipu->prg_priv; -struct ipu_prg_channel *chan = &prg->chan[prg_chan]; +struct ipu_prg_channel *chan;u32 val; -if (!chan->enabled || prg_chan <0 ) +if (prg_chan <0 ) +return ; + + chan = &prg->chan[prg_chan]; +if (!chan->enabled)return ;pm_runtime_get_sync (prg->dev);
@@ -280,13 +284,15 @@ int ipu_prg_channel_configure(struct ipuv3_channel *ipu_chan, {int prg_chan =ipu_prg_ipu_to_prg_chan (ipu_chan->num);struct ipu_prg *prg = ipu_chan->ipu->prg_priv; -struct ipu_prg_channel *chan = &prg->chan[prg_chan]; +struct ipu_prg_channel *chan;u32 val;int ret;if (prg_chan <0 )return prg_chan; + chan = &prg->chan[prg_chan]; +if (chan->enabled) {ipu_pre_update (prg->pres[chan->used_pre], *eba);return 0 ;
Signature · 6 lines
2.9.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Philipp Zabel
maintainerHi Arnd,
Quoted 10 lines · Arnd Bergmann
gcc-8 reports that we access an array with a negative index in an error case:
drivers/gpu/ipu-v3/ipu-prg.c: In function 'ipu_prg_channel_disable':drivers/gpu/ipu-v3/ipu-prg.c:252:43: error: array subscript -22 is below array bounds of 'struct ipu_prg_channel[3]' [-Werror=array-bounds]This moves the range check in front of the first time that variable gets used.
Signed-off-by Arnd Bergmann <[email protected]>
thank you, I've replaced v2 with this version in imx-drm/fixes.
regards
Philipp
Quoted 36 lines
----
v1: Originally sent on Dec 4, 2017.
v2: Sent again on Jan 16, after no reply, Phillipp said it was merged
v3: Ran into a related problem withCONFIG_UBSAN, sent again fixing both--- drivers/gpu/ipu-v3/ipu-prg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)drivers/gpu/ipu-v3/ipu-prg.c +7
-3@@ -250,10 +250,14 @@ void ipu_prg_channel_disable(struct ipuv3_channel *ipu_chan) {int prg_chan =ipu_prg_ipu_to_prg_chan (ipu_chan->num);struct ipu_prg *prg = ipu_chan->ipu->prg_priv; -struct ipu_prg_channel *chan = &prg->chan[prg_chan]; +struct ipu_prg_channel *chan;u32 val; -if (!chan->enabled || prg_chan <0 ) +if (prg_chan <0 ) +return ; + + chan = &prg->chan[prg_chan]; +if (!chan->enabled)return ;pm_runtime_get_sync (prg->dev);@@ -280,13 +284,15 @@ int ipu_prg_channel_configure(struct ipuv3_channel *ipu_chan, {int prg_chan =ipu_prg_ipu_to_prg_chan (ipu_chan->num);struct ipu_prg *prg = ipu_chan->ipu->prg_priv; -struct ipu_prg_channel *chan = &prg->chan[prg_chan]; +struct ipu_prg_channel *chan;u32 val;
drivers/gpu/ipu-v3/ipu-prg.c int ipu_prg_channel_configure(struct ipuv3_channel *ipu_chan, · line 298
Quoted 10 lines
drivers/gpu/ipu-v3/ipu-prg.c +2
-0int ret;if (prg_chan <0 )return prg_chan; + chan = &prg->chan[prg_chan]; +if (chan->enabled) {ipu_pre_update (prg->pres[chan->used_pre], *eba);return 0 ;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel