From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 ); Thu, 15 Feb 2018 10:03:57 -0500 From: Jani Nikula To: mika.kahola@intel.com, intel-gfx@lists.freedesktop.org Cc: "# v4 . 10+" , Rodrigo Vivi , Joonas Lahtinen , "Pandiyan\, Dhinakaran" 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: On Thu, 15 Feb 2018, Mika Kahola 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: # v4.10+ >> Cc: Mika Kahola >> Cc: Rodrigo Vivi >> Cc: Jani Nikula >> Cc: Joonas Lahtinen >> Cc: intel-gfx@lists.freedesktop.org > > Reviewed-by: Mika Kahola Pushed to dinq, thanks for the reviews. BR, Jani. > >> 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 -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915/audio: fix check for av_enc_map overflow Date: Thu, 15 Feb 2018 17:03:47 +0200 Message-ID: <87y3ju2t2k.fsf@intel.com> References: <20180214173840.25360-1-jani.nikula@intel.com> <1518680552.7484.16.camel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 905F06E077 for ; Thu, 15 Feb 2018 15:03:56 +0000 (UTC) In-Reply-To: <1518680552.7484.16.camel@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: mika.kahola@intel.com, intel-gfx@lists.freedesktop.org Cc: "Pandiyan, Dhinakaran" , "# v4 . 10+" , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAxNSBGZWIgMjAxOCwgTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4g d3JvdGU6Cj4gT24gV2VkLCAyMDE4LTAyLTE0IGF0IDE5OjM4ICswMjAwLCBKYW5pIE5pa3VsYSB3 cm90ZToKPj4gVHVybnMgb3V0IC0xID49IEFSUkFZX1NJWkUoKSBpcyBhbHdheXMgdHJ1ZS4gTW92 ZSB0aGUgYm91bmRzIGNoZWNrCj4+IHdoZXJlCj4+IHdlIGtub3cgcGlwZSA+PSAwIGFuZCBuZXh0 IHRvIHRoZSBhcnJheSBpbmRleGluZyB3aGVyZSBpdCBtYWtlcyBtb3N0Cj4+IHNlbnNlLgo+PiAK Pj4gRml4ZXM6IDk5NjVkYjI2YWMwNSAoImRybS9pOTE1OiBDaGVjayBmb3IgZnVzZWQgb3IgdW51 c2VkIHBpcGVzIikKPj4gRml4ZXM6IDBiNzAyOWI3ZTQzZiAoImRybS9pOTE1OiBDaGVjayBmb3Ig ZnVzZWQgb3IgdW51c2VkIHBpcGVzIikKPj4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAj IHY0LjEwKwo+PiBDYzogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KPj4gQ2M6 IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KPj4gQ2M6IEphbmkgTmlrdWxh IDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+Cj4+IENjOiBKb29uYXMgTGFodGluZW4gPGpv b25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Cj4+IENjOiBpbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4KPiBSZXZpZXdlZC1ieTogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xhQGlu dGVsLmNvbT4KClB1c2hlZCB0byBkaW5xLCB0aGFua3MgZm9yIHRoZSByZXZpZXdzLgoKQlIsCkph bmkuCgo+Cj4+IFNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5j b20+Cj4+IC0tLQo+PiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMgfCA2ICsr Ky0tLQo+PiDCoDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0p Cj4+IAo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwo+ PiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKPj4gaW5kZXggZmY0NTVjNzI0 Nzc1Li43MDlkNmNhNjgwNzQgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F1ZGlvLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwo+ PiBAQCAtNzc5LDExICs3NzksMTEgQEAgc3RhdGljIHN0cnVjdCBpbnRlbF9lbmNvZGVyCj4+ICpn ZXRfc2F2ZWRfZW5jKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPj4gwqB7Cj4+ IMKgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+PiDCoAo+PiAtCWlmIChXQVJOX09O KHBpcGUgPj0gQVJSQVlfU0laRShkZXZfcHJpdi0+YXZfZW5jX21hcCkpKQo+PiAtCQlyZXR1cm4g TlVMTDsKPj4gLQo+PiDCoAkvKiBNU1QgKi8KPj4gwqAJaWYgKHBpcGUgPj0gMCkgewo+PiArCQlp ZiAoV0FSTl9PTihwaXBlID49IEFSUkFZX1NJWkUoZGV2X3ByaXYtCj4+ID5hdl9lbmNfbWFwKSkp Cj4+ICsJCQlyZXR1cm4gTlVMTDsKPj4gKwo+PiDCoAkJZW5jb2RlciA9IGRldl9wcml2LT5hdl9l bmNfbWFwW3BpcGVdOwo+PiDCoAkJLyoKPj4gwqAJCcKgKiB3aGVuIGJvb3R1cCwgYXVkaW8gZHJp dmVyIG1heSBub3Qga25vdyBpdCBpcwoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJj ZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK