From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mga07.intel.com ([134.134.136.100]:44050 "EHLO mga07.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1754940AbeBOHmf (ORCPT <rfc822;stable@vger.kernel.org>);
        Thu, 15 Feb 2018 02:42:35 -0500
Message-ID: <1518680552.7484.16.camel@intel.com>
Subject: Re: [PATCH] drm/i915/audio: fix check for av_enc_map overflow
From: Mika Kahola <mika.kahola@intel.com>
Reply-To: mika.kahola@intel.com
To: Jani Nikula <jani.nikula@intel.com>,
        intel-gfx@lists.freedesktop.org
Cc: "# v4 . 10+" <stable@vger.kernel.org>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date: Thu, 15 Feb 2018 09:42:32 +0200
In-Reply-To: <20180214173840.25360-1-jani.nikula@intel.com>
References: <20180214173840.25360-1-jani.nikula@intel.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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