From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mga06.intel.com ([134.134.136.31]:61004 "EHLO mga06.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1033510AbeBOPD5 (ORCPT <rfc822;stable@vger.kernel.org>);
        Thu, 15 Feb 2018 10:03:57 -0500
From: Jani Nikula <jani.nikula@intel.com>
To: mika.kahola@intel.com, intel-gfx@lists.freedesktop.org
Cc: "# v4 . 10+" <stable@vger.kernel.org>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        "Pandiyan\, Dhinakaran" <dhinakaran.pandiyan@intel.com>
Subject: Re: [PATCH] drm/i915/audio: fix check for av_enc_map overflow
In-Reply-To: <1518680552.7484.16.camel@intel.com>
References: <20180214173840.25360-1-jani.nikula@intel.com> <1518680552.7484.16.camel@intel.com>
Date: Thu, 15 Feb 2018 17:03:47 +0200
Message-ID: <87y3ju2t2k.fsf@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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