From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 13 Apr 2017 19:48:28 +0000 Subject: [PATCH] drm/i915/gvt: fix a bounds check in ring_id_to_context_switch_event() Message-Id: <20170413194828.GF591@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Zhenyu Wang , Zhi Wang Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Daniel Vetter , intel-gvt-dev@lists.freedesktop.org There are two bugs here. The && should be || and the > is off by one so it should be >= ARRAY_SIZE(). Fixes: 8453d674ae7e ("drm/i915/gvt: vGPU execlist virtualization") Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/i915/gvt/execlist.c b/drivers/gpu/drm/i915/gvt/execlist.c index 536bde8638c8..026c491716d5 100644 --- a/drivers/gpu/drm/i915/gvt/execlist.c +++ b/drivers/gpu/drm/i915/gvt/execlist.c @@ -56,8 +56,8 @@ static int context_switch_events[] = { static int ring_id_to_context_switch_event(int ring_id) { - if (WARN_ON(ring_id < RCS && ring_id > - ARRAY_SIZE(context_switch_events))) + if (WARN_ON(ring_id < RCS || + ring_id >= ARRAY_SIZE(context_switch_events))) return -EINVAL; return context_switch_events[ring_id]; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/i915/gvt: fix a bounds check in ring_id_to_context_switch_event() Date: Thu, 13 Apr 2017 22:48:28 +0300 Message-ID: <20170413194828.GF591@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Zhenyu Wang , Zhi Wang Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Daniel Vetter , intel-gvt-dev@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgYXJlIHR3byBidWdzIGhlcmUuICBUaGUgJiYgc2hvdWxkIGJlIHx8IGFuZCB0aGUgPiBp cyBvZmYgYnkgb25lIHNvCml0IHNob3VsZCBiZSA+PSBBUlJBWV9TSVpFKCkuCgpGaXhlczogODQ1 M2Q2NzRhZTdlICgiZHJtL2k5MTUvZ3Z0OiB2R1BVIGV4ZWNsaXN0IHZpcnR1YWxpemF0aW9uIikK U2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9leGVjbGlzdC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3Z0L2V4ZWNsaXN0LmMKaW5kZXggNTM2YmRlODYzOGM4Li4wMjZjNDkx NzE2ZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9leGVjbGlzdC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9leGVjbGlzdC5jCkBAIC01Niw4ICs1Niw4IEBA IHN0YXRpYyBpbnQgY29udGV4dF9zd2l0Y2hfZXZlbnRzW10gPSB7CiAKIHN0YXRpYyBpbnQgcmlu Z19pZF90b19jb250ZXh0X3N3aXRjaF9ldmVudChpbnQgcmluZ19pZCkKIHsKLQlpZiAoV0FSTl9P TihyaW5nX2lkIDwgUkNTICYmIHJpbmdfaWQgPgotCQkJCUFSUkFZX1NJWkUoY29udGV4dF9zd2l0 Y2hfZXZlbnRzKSkpCisJaWYgKFdBUk5fT04ocmluZ19pZCA8IFJDUyB8fAorCQkgICAgcmluZ19p ZCA+PSBBUlJBWV9TSVpFKGNvbnRleHRfc3dpdGNoX2V2ZW50cykpKQogCQlyZXR1cm4gLUVJTlZB TDsKIAogCXJldHVybiBjb250ZXh0X3N3aXRjaF9ldmVudHNbcmluZ19pZF07Cl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=