From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kahola Subject: Re: [PATCH] drm/i915/audio: fix check for av_enc_map overflow Date: Thu, 15 Feb 2018 09:42:32 +0200 Message-ID: <1518680552.7484.16.camel@intel.com> References: <20180214173840.25360-1-jani.nikula@intel.com> Reply-To: mika.kahola@intel.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13DB8893C9 for ; Thu, 15 Feb 2018 07:42:35 +0000 (UTC) In-Reply-To: <20180214173840.25360-1-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , intel-gfx@lists.freedesktop.org Cc: "# v4 . 10+" , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAyMDE4LTAyLTE0IGF0IDE5OjM4ICswMjAwLCBKYW5pIE5pa3VsYSB3cm90ZToKPiBU dXJucyBvdXQgLTEgPj0gQVJSQVlfU0laRSgpIGlzIGFsd2F5cyB0cnVlLiBNb3ZlIHRoZSBib3Vu ZHMgY2hlY2sKPiB3aGVyZQo+IHdlIGtub3cgcGlwZSA+PSAwIGFuZCBuZXh0IHRvIHRoZSBhcnJh eSBpbmRleGluZyB3aGVyZSBpdCBtYWtlcyBtb3N0Cj4gc2Vuc2UuCj4gCj4gRml4ZXM6IDk5NjVk YjI2YWMwNSAoImRybS9pOTE1OiBDaGVjayBmb3IgZnVzZWQgb3IgdW51c2VkIHBpcGVzIikKPiBG aXhlczogMGI3MDI5YjdlNDNmICgiZHJtL2k5MTU6IENoZWNrIGZvciBmdXNlZCBvciB1bnVzZWQg cGlwZXMiKQo+IENjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gIyB2NC4xMCsKPiBDYzogTWlr YSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KPiBDYzogUm9kcmlnbyBWaXZpIDxyb2Ry aWdvLnZpdmlAaW50ZWwuY29tPgo+IENjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXgu aW50ZWwuY29tPgo+IENjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5p bnRlbC5jb20+Cj4gQ2M6IGludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKClJldmlld2Vk LWJ5OiBNaWthIEthaG9sYSA8bWlrYS5rYWhvbGFAaW50ZWwuY29tPgoKPiBTaWduZWQtb2ZmLWJ5 OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgo+IC0tLQo+IMKgZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyB8IDYgKysrLS0tCj4gwqAxIGZpbGUgY2hhbmdlZCwg MyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCj4gYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdWRpby5jCj4gaW5kZXggZmY0NTVjNzI0Nzc1Li43MDlkNmNhNjgwNzQgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKPiBAQCAtNzc5LDExICs3NzksMTEgQEAgc3RhdGljIHN0 cnVjdCBpbnRlbF9lbmNvZGVyCj4gKmdldF9zYXZlZF9lbmMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAo+IMKgewo+IMKgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+ IMKgCj4gLQlpZiAoV0FSTl9PTihwaXBlID49IEFSUkFZX1NJWkUoZGV2X3ByaXYtPmF2X2VuY19t YXApKSkKPiAtCQlyZXR1cm4gTlVMTDsKPiAtCj4gwqAJLyogTVNUICovCj4gwqAJaWYgKHBpcGUg Pj0gMCkgewo+ICsJCWlmIChXQVJOX09OKHBpcGUgPj0gQVJSQVlfU0laRShkZXZfcHJpdi0KPiA+ YXZfZW5jX21hcCkpKQo+ICsJCQlyZXR1cm4gTlVMTDsKPiArCj4gwqAJCWVuY29kZXIgPSBkZXZf cHJpdi0+YXZfZW5jX21hcFtwaXBlXTsKPiDCoAkJLyoKPiDCoAkJwqAqIHdoZW4gYm9vdHVwLCBh dWRpbyBkcml2ZXIgbWF5IG5vdCBrbm93IGl0IGlzCi0tIApNaWthIEthaG9sYSAtIEludGVsIE9U QwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 ); 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 Reply-To: mika.kahola@intel.com To: Jani Nikula , intel-gfx@lists.freedesktop.org Cc: "# v4 . 10+" , Rodrigo Vivi , Jani Nikula , Joonas Lahtinen 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: 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: # v4.10+ > Cc: Mika Kahola > Cc: Rodrigo Vivi > Cc: Jani Nikula > Cc: Joonas Lahtinen > Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Mika Kahola > Signed-off-by: Jani Nikula > --- >  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