* [PATCH] drm/i915/audio: fix check for av_enc_map overflow
@ 2018-02-14 17:38 Jani Nikula
2018-02-14 20:07 ` [Intel-gfx] " Pandiyan, Dhinakaran
2018-02-15 7:42 ` Mika Kahola
0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2018-02-14 17:38 UTC (permalink / raw)
To: intel-gfx
Cc: Jani Nikula, # v4 . 10+, Mika Kahola, Rodrigo Vivi, Jani Nikula,
Joonas Lahtinen
Turns out -1 >= ARRAY_SIZE() is always true. Move the bounds check where
we know pipe >= 0 and next to the array indexing where it makes most
sense.
Fixes: 9965db26ac05 ("drm/i915: Check for fused or unused pipes")
Fixes: 0b7029b7e43f ("drm/i915: Check for fused or unused pipes")
Cc: <stable@vger.kernel.org> # v4.10+
Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_audio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index ff455c724775..709d6ca68074 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -779,11 +779,11 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,
{
struct intel_encoder *encoder;
- if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
- return NULL;
-
/* MST */
if (pipe >= 0) {
+ if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
+ return NULL;
+
encoder = dev_priv->av_enc_map[pipe];
/*
* when bootup, audio driver may not know it is
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/audio: fix check for av_enc_map overflow
2018-02-14 17:38 [PATCH] drm/i915/audio: fix check for av_enc_map overflow Jani Nikula
@ 2018-02-14 20:07 ` Pandiyan, Dhinakaran
2018-02-15 7:42 ` Mika Kahola
1 sibling, 0 replies; 4+ messages in thread
From: Pandiyan, Dhinakaran @ 2018-02-14 20:07 UTC (permalink / raw)
To: Nikula, Jani
Cc: intel-gfx@lists.freedesktop.org, Vivi, Rodrigo,
stable@vger.kernel.org
z
On Wed, 2018-02-14 at 19:38 +0200, Jani Nikula wrote:
> Turns out -1 >= ARRAY_SIZE() is always true. Move the bounds check where
> we know pipe >= 0 and next to the array indexing where it makes most
> sense.
>
> Fixes: 9965db26ac05 ("drm/i915: Check for fused or unused pipes")
> Fixes: 0b7029b7e43f ("drm/i915: Check for fused or unused pipes")
> Cc: <stable@vger.kernel.org> # v4.10+
> Cc: Mika Kahola <mika.kahola@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
> drivers/gpu/drm/i915/intel_audio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index ff455c724775..709d6ca68074 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -779,11 +779,11 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,
> {
> struct intel_encoder *encoder;
>
> - if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
> - return NULL;
> -
> /* MST */
> if (pipe >= 0) {
> + if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
> + return NULL;
> +
> encoder = dev_priv->av_enc_map[pipe];
> /*
> * when bootup, audio driver may not know it is
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/audio: fix check for av_enc_map overflow
2018-02-14 17:38 [PATCH] drm/i915/audio: fix check for av_enc_map overflow Jani Nikula
2018-02-14 20:07 ` [Intel-gfx] " Pandiyan, Dhinakaran
@ 2018-02-15 7:42 ` Mika Kahola
2018-02-15 15:03 ` Jani Nikula
1 sibling, 1 reply; 4+ messages in thread
From: Mika Kahola @ 2018-02-15 7:42 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Cc: # v4 . 10+, Rodrigo Vivi, Jani Nikula, Joonas Lahtinen
On Wed, 2018-02-14 at 19:38 +0200, Jani Nikula wrote:
> Turns out -1 >= ARRAY_SIZE() is always true. Move the bounds check
> where
> we know pipe >= 0 and next to the array indexing where it makes most
> sense.
>
> Fixes: 9965db26ac05 ("drm/i915: Check for fused or unused pipes")
> Fixes: 0b7029b7e43f ("drm/i915: Check for fused or unused pipes")
> Cc: <stable@vger.kernel.org> # v4.10+
> Cc: Mika Kahola <mika.kahola@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_audio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> index ff455c724775..709d6ca68074 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -779,11 +779,11 @@ static struct intel_encoder
> *get_saved_enc(struct drm_i915_private *dev_priv,
> {
> struct intel_encoder *encoder;
>
> - if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
> - return NULL;
> -
> /* MST */
> if (pipe >= 0) {
> + if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv-
> >av_enc_map)))
> + return NULL;
> +
> encoder = dev_priv->av_enc_map[pipe];
> /*
> * when bootup, audio driver may not know it is
--
Mika Kahola - Intel OTC
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/audio: fix check for av_enc_map overflow
2018-02-15 7:42 ` Mika Kahola
@ 2018-02-15 15:03 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2018-02-15 15:03 UTC (permalink / raw)
To: mika.kahola, intel-gfx
Cc: # v4 . 10+, Rodrigo Vivi, Joonas Lahtinen, Pandiyan, Dhinakaran
On Thu, 15 Feb 2018, Mika Kahola <mika.kahola@intel.com> wrote:
> On Wed, 2018-02-14 at 19:38 +0200, Jani Nikula wrote:
>> Turns out -1 >= ARRAY_SIZE() is always true. Move the bounds check
>> where
>> we know pipe >= 0 and next to the array indexing where it makes most
>> sense.
>>
>> Fixes: 9965db26ac05 ("drm/i915: Check for fused or unused pipes")
>> Fixes: 0b7029b7e43f ("drm/i915: Check for fused or unused pipes")
>> Cc: <stable@vger.kernel.org> # v4.10+
>> Cc: Mika Kahola <mika.kahola@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: intel-gfx@lists.freedesktop.org
>
> Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Pushed to dinq, thanks for the reviews.
BR,
Jani.
>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_audio.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_audio.c
>> b/drivers/gpu/drm/i915/intel_audio.c
>> index ff455c724775..709d6ca68074 100644
>> --- a/drivers/gpu/drm/i915/intel_audio.c
>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>> @@ -779,11 +779,11 @@ static struct intel_encoder
>> *get_saved_enc(struct drm_i915_private *dev_priv,
>> {
>> struct intel_encoder *encoder;
>>
>> - if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
>> - return NULL;
>> -
>> /* MST */
>> if (pipe >= 0) {
>> + if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv-
>> >av_enc_map)))
>> + return NULL;
>> +
>> encoder = dev_priv->av_enc_map[pipe];
>> /*
>> * when bootup, audio driver may not know it is
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-15 15:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-14 17:38 [PATCH] drm/i915/audio: fix check for av_enc_map overflow Jani Nikula
2018-02-14 20:07 ` [Intel-gfx] " Pandiyan, Dhinakaran
2018-02-15 7:42 ` Mika Kahola
2018-02-15 15:03 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox