* [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
@ 2019-06-07 7:27 ` Dan Carpenter
0 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2019-06-07 7:27 UTC (permalink / raw)
To: Andrzej Hajda, Jyri Sarha
Cc: David Airlie, dri-devel, kernel-janitors, Laurent Pinchart
This should check that "i" is within bounds before checking reading from
the array.
Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/bridge/sii902x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index d6f98d388ac2..6b03616d6bc3 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
if (ret)
goto out;
- for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
- i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
+ for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
+ sii902x->audio.i2s_fifo_sequence[i]; i++)
regmap_write(sii902x->regmap,
SII902X_TPI_I2S_ENABLE_MAPPING_REG,
sii902x->audio.i2s_fifo_sequence[i]);
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
2019-06-07 7:27 ` Dan Carpenter
@ 2019-06-07 7:39 ` walter harms
-1 siblings, 0 replies; 10+ messages in thread
From: walter harms @ 2019-06-07 7:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: David Airlie, kernel-janitors, Jyri Sarha, dri-devel,
Laurent Pinchart
Am 07.06.2019 09:27, schrieb Dan Carpenter:
> This should check that "i" is within bounds before checking reading from
> the array.
>
> Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index d6f98d388ac2..6b03616d6bc3 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> if (ret)
> goto out;
>
> - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> + sii902x->audio.i2s_fifo_sequence[i]; i++)
> regmap_write(sii902x->regmap,
> SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> sii902x->audio.i2s_fifo_sequence[i]);
mmmh, i am a big fan of KISS and in this case i would check sii902x->audio.i2s_fifo_sequence[i]
outside for(). like:
for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++) {
if (!sii902x->audio.i2s_fifo_sequence[i])
break;
regmap_write(sii902x->regmap,
SII902X_TPI_I2S_ENABLE_MAPPING_REG,
sii902x->audio.i2s_fifo_sequence[i]);
}
just my 2 cents,
re,
wh
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
@ 2019-06-07 7:39 ` walter harms
0 siblings, 0 replies; 10+ messages in thread
From: walter harms @ 2019-06-07 7:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: David Airlie, kernel-janitors, Jyri Sarha, dri-devel,
Laurent Pinchart
Am 07.06.2019 09:27, schrieb Dan Carpenter:
> This should check that "i" is within bounds before checking reading from
> the array.
>
> Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index d6f98d388ac2..6b03616d6bc3 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> if (ret)
> goto out;
>
> - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> + sii902x->audio.i2s_fifo_sequence[i]; i++)
> regmap_write(sii902x->regmap,
> SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> sii902x->audio.i2s_fifo_sequence[i]);
mmmh, i am a big fan of KISS and in this case i would check sii902x->audio.i2s_fifo_sequence[i]
outside for(). like:
for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++) {
if (!sii902x->audio.i2s_fifo_sequence[i])
break;
regmap_write(sii902x->regmap,
SII902X_TPI_I2S_ENABLE_MAPPING_REG,
sii902x->audio.i2s_fifo_sequence[i]);
}
just my 2 cents,
re,
wh
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
2019-06-07 7:39 ` walter harms
@ 2019-06-07 7:58 ` Dan Carpenter
-1 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2019-06-07 7:58 UTC (permalink / raw)
To: walter harms
Cc: David Airlie, kernel-janitors, Jyri Sarha, dri-devel,
Laurent Pinchart
On Fri, Jun 07, 2019 at 09:39:57AM +0200, walter harms wrote:
>
>
> Am 07.06.2019 09:27, schrieb Dan Carpenter:
> > This should check that "i" is within bounds before checking reading from
> > the array.
> >
> > Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> > index d6f98d388ac2..6b03616d6bc3 100644
> > --- a/drivers/gpu/drm/bridge/sii902x.c
> > +++ b/drivers/gpu/drm/bridge/sii902x.c
> > @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> > if (ret)
> > goto out;
> >
> > - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> > - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> > + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> > + sii902x->audio.i2s_fifo_sequence[i]; i++)
> > regmap_write(sii902x->regmap,
> > SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> > sii902x->audio.i2s_fifo_sequence[i]);
>
>
> mmmh, i am a big fan of KISS and in this case i would check sii902x->audio.i2s_fifo_sequence[i]
> outside for(). like:
>
> for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++) {
> if (!sii902x->audio.i2s_fifo_sequence[i])
> break;
That's probably a better way, but either way is acceptable and I left it
how the author wrote it.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
@ 2019-06-07 7:58 ` Dan Carpenter
0 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2019-06-07 7:58 UTC (permalink / raw)
To: walter harms
Cc: David Airlie, kernel-janitors, Jyri Sarha, dri-devel,
Laurent Pinchart
On Fri, Jun 07, 2019 at 09:39:57AM +0200, walter harms wrote:
>
>
> Am 07.06.2019 09:27, schrieb Dan Carpenter:
> > This should check that "i" is within bounds before checking reading from
> > the array.
> >
> > Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> > index d6f98d388ac2..6b03616d6bc3 100644
> > --- a/drivers/gpu/drm/bridge/sii902x.c
> > +++ b/drivers/gpu/drm/bridge/sii902x.c
> > @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> > if (ret)
> > goto out;
> >
> > - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> > - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> > + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> > + sii902x->audio.i2s_fifo_sequence[i]; i++)
> > regmap_write(sii902x->regmap,
> > SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> > sii902x->audio.i2s_fifo_sequence[i]);
>
>
> mmmh, i am a big fan of KISS and in this case i would check sii902x->audio.i2s_fifo_sequence[i]
> outside for(). like:
>
> for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++) {
> if (!sii902x->audio.i2s_fifo_sequence[i])
> break;
That's probably a better way, but either way is acceptable and I left it
how the author wrote it.
regards,
dan carpenter
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
2019-06-07 7:27 ` Dan Carpenter
@ 2019-06-07 9:43 ` Andrzej Hajda
-1 siblings, 0 replies; 10+ messages in thread
From: Andrzej Hajda @ 2019-06-07 9:43 UTC (permalink / raw)
To: Dan Carpenter, Jyri Sarha
Cc: David Airlie, dri-devel, kernel-janitors, Laurent Pinchart
On 07.06.2019 09:27, Dan Carpenter wrote:
> This should check that "i" is within bounds before checking reading from
> the array.
>
> Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
 --
Regards
Andrzej
> ---
> drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index d6f98d388ac2..6b03616d6bc3 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> if (ret)
> goto out;
>
> - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> + sii902x->audio.i2s_fifo_sequence[i]; i++)
> regmap_write(sii902x->regmap,
> SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> sii902x->audio.i2s_fifo_sequence[i]);
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
@ 2019-06-07 9:43 ` Andrzej Hajda
0 siblings, 0 replies; 10+ messages in thread
From: Andrzej Hajda @ 2019-06-07 9:43 UTC (permalink / raw)
To: Dan Carpenter, Jyri Sarha
Cc: David Airlie, dri-devel, kernel-janitors, Laurent Pinchart
On 07.06.2019 09:27, Dan Carpenter wrote:
> This should check that "i" is within bounds before checking reading from
> the array.
>
> Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej
> ---
> drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index d6f98d388ac2..6b03616d6bc3 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> if (ret)
> goto out;
>
> - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> + sii902x->audio.i2s_fifo_sequence[i]; i++)
> regmap_write(sii902x->regmap,
> SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> sii902x->audio.i2s_fifo_sequence[i]);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
2019-06-07 7:27 ` Dan Carpenter
@ 2019-06-07 13:15 ` Andrzej Hajda
-1 siblings, 0 replies; 10+ messages in thread
From: Andrzej Hajda @ 2019-06-07 13:15 UTC (permalink / raw)
To: Dan Carpenter, Jyri Sarha
Cc: David Airlie, dri-devel, kernel-janitors, Laurent Pinchart
On 07.06.2019 09:27, Dan Carpenter wrote:
> This should check that "i" is within bounds before checking reading from
> the array.
>
> Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index d6f98d388ac2..6b03616d6bc3 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> if (ret)
> goto out;
>
> - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> + sii902x->audio.i2s_fifo_sequence[i]; i++)
> regmap_write(sii902x->regmap,
> SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> sii902x->audio.i2s_fifo_sequence[i]);
Queued to drm-misc-next.
--
Regards
Andrzej
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read
@ 2019-06-07 13:15 ` Andrzej Hajda
0 siblings, 0 replies; 10+ messages in thread
From: Andrzej Hajda @ 2019-06-07 13:15 UTC (permalink / raw)
To: Dan Carpenter, Jyri Sarha
Cc: David Airlie, dri-devel, kernel-janitors, Laurent Pinchart
On 07.06.2019 09:27, Dan Carpenter wrote:
> This should check that "i" is within bounds before checking reading from
> the array.
>
> Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/gpu/drm/bridge/sii902x.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index d6f98d388ac2..6b03616d6bc3 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
> if (ret)
> goto out;
>
> - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] &&
> - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++)
> + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) &&
> + sii902x->audio.i2s_fifo_sequence[i]; i++)
> regmap_write(sii902x->regmap,
> SII902X_TPI_I2S_ENABLE_MAPPING_REG,
> sii902x->audio.i2s_fifo_sequence[i]);
Queued to drm-misc-next.
--
Regards
Andrzej
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread