From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.15 010/146] drm/i915/audio: fix check for av_enc_map overflow Date: Tue, 13 Mar 2018 16:22:57 +0100 Message-ID: <20180313152321.396639946@linuxfoundation.org> References: <20180313152320.439085687@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 569BD6E58C for ; Tue, 13 Mar 2018 15:27:45 +0000 (UTC) In-Reply-To: <20180313152320.439085687@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-kernel@vger.kernel.org Cc: Jani Nikula , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Rodrigo Vivi , Dhinakaran Pandiyan List-Id: intel-gfx@lists.freedesktop.org NC4xNS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBKYW5pIE5pa3Vs YSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgoKY29tbWl0IDcyYTZkNzJjMmNkMDNiYmE3YjcwMTE3 YjYzZGVhODNkMmRlODgwNTcgdXBzdHJlYW0uCgpUdXJucyBvdXQgLTEgPj0gQVJSQVlfU0laRSgp IGlzIGFsd2F5cyB0cnVlLiBNb3ZlIHRoZSBib3VuZHMgY2hlY2sgd2hlcmUKd2Uga25vdyBwaXBl ID49IDAgYW5kIG5leHQgdG8gdGhlIGFycmF5IGluZGV4aW5nIHdoZXJlIGl0IG1ha2VzIG1vc3QK c2Vuc2UuCgpGaXhlczogOTk2NWRiMjZhYzA1ICgiZHJtL2k5MTU6IENoZWNrIGZvciBmdXNlZCBv ciB1bnVzZWQgcGlwZXMiKQpGaXhlczogMGI3MDI5YjdlNDNmICgiZHJtL2k5MTU6IENoZWNrIGZv ciBmdXNlZCBvciB1bnVzZWQgcGlwZXMiKQpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ICMg djQuMTArCkNjOiBNaWthIEthaG9sYSA8bWlrYS5rYWhvbGFAaW50ZWwuY29tPgpDYzogUm9kcmln byBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlr dWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVu QGxpbnV4LmludGVsLmNvbT4KQ2M6IGludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKUmV2 aWV3ZWQtYnk6IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KTGluazogaHR0 cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTgwMjE0MTczODQw LjI1MzYwLTEtamFuaS5uaWt1bGFAaW50ZWwuY29tCihjaGVycnkgcGlja2VkIGZyb20gY29tbWl0 IGNkYjNkYjg1NDJkODU0YmQ2NzhkNjBjZDI4ODYxYjA0MmUxOTE2NzIpClNpZ25lZC1vZmYtYnk6 IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogR3Jl ZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyB8ICAgIDYgKysrLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfYXVkaW8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRp by5jCkBAIC03NTQsMTEgKzc1NCwxMSBAQCBzdGF0aWMgc3RydWN0IGludGVsX2VuY29kZXIgKmdl dF9zYXZlZF9lCiB7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAKLQlpZiAoV0FS Tl9PTihwaXBlID49IEFSUkFZX1NJWkUoZGV2X3ByaXYtPmF2X2VuY19tYXApKSkKLQkJcmV0dXJu IE5VTEw7Ci0KIAkvKiBNU1QgKi8KIAlpZiAocGlwZSA+PSAwKSB7CisJCWlmIChXQVJOX09OKHBp cGUgPj0gQVJSQVlfU0laRShkZXZfcHJpdi0+YXZfZW5jX21hcCkpKQorCQkJcmV0dXJuIE5VTEw7 CisKIAkJZW5jb2RlciA9IGRldl9wcml2LT5hdl9lbmNfbWFwW3BpcGVdOwogCQkvKgogCQkgKiB3 aGVuIGJvb3R1cCwgYXVkaW8gZHJpdmVyIG1heSBub3Qga25vdyBpdCBpcwoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvTGI/ZUsiu6L7L1sdwhlqg6gVP8+rJipbRyOO9VUsnXTkKGwFaNwDHGYxhkL3GX7NZaP0o ARC-Seal: i=1; a=rsa-sha256; t=1520954865; cv=none; d=google.com; s=arc-20160816; b=ec2QPXse7W/vazqfoZJOCXUT7d8ZkazQS58KKgV0qlAnwEMTX7c3gC/zYj0wVNuaMJ qL5+9O3D6XZs2S596ZhhURF2doYyQWmHYMnhsnHzn2hGBQBTV1Yldg+1z08F63aM8DjC WUqpUd+kstNBl+eS/3L8K04L22rowGuDule8wMFP6PFbaXeKD7uZkSRWyzWxub86RMzy K+Y84a9jL2IjywCZeLQmwtuOVuMW9nWhKUZpz3ir/MiNmrl5un3Osmu759ET1eOSPlJ2 M6FGjcUZjyLYmxioNf/6Z24QTiB7pWjg7TXfXJEB6w6xvJXXH3IDktA4B1e1a/27nCWS JYSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=hpdMEFvE2MPgVB7+6mrjZ+6aAwevoLPcs1x/Y2mKsAQ=; b=y1eBd5CFjcNjPxvYnn7wG+sDBc89UPc6+NAwjM2H7pouWCvqlHs+tml+ADZJcZfMDS qgVJgdT/0a1XrRLJ+9RNVgQU0hpW46TV6uYv+lyefYr8CC8xpKOLtP4opXVI0t+53xK0 28t1dSPMhujc9lakTHxyyd6XKofZqtlLUM6to/Z5CiueLkL9EVV1ePC8b+BjPtSIsOPg QecHjR2PYVQcs8DlPOIvf2zaNLezo/WgFMO7DjQFGN/jRO9GuFQQV/r+iVDeqkbzjVa+ Mdi/xe0+gyEL4g/MVSVpFAa65kT6ie07fwIdHt1ZV0z+Uv2sFLVgcxXNb2Vcl1oFRIGr qE+g== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mika Kahola , Rodrigo Vivi , Jani Nikula , Joonas Lahtinen , intel-gfx@lists.freedesktop.org, Dhinakaran Pandiyan , Jani Nikula Subject: [PATCH 4.15 010/146] drm/i915/audio: fix check for av_enc_map overflow Date: Tue, 13 Mar 2018 16:22:57 +0100 Message-Id: <20180313152321.396639946@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313152320.439085687@linuxfoundation.org> References: <20180313152320.439085687@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594836769072954901?= X-GMAIL-MSGID: =?utf-8?q?1594836769072954901?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jani Nikula commit 72a6d72c2cd03bba7b70117b63dea83d2de88057 upstream. 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: Dhinakaran Pandiyan Reviewed-by: Mika Kahola Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20180214173840.25360-1-jani.nikula@intel.com (cherry picked from commit cdb3db8542d854bd678d60cd28861b042e191672) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -754,11 +754,11 @@ static struct intel_encoder *get_saved_e { 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