From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Validate execbuffer start/length arguments against the target bo Date: Thu, 28 Apr 2016 11:54:04 +0300 Message-ID: <8760v2i05v.fsf@intel.com> References: <1448032264-31086-1-git-send-email-chris@chris-wilson.co.uk> <20151120153825.GS4437@intel.com> <878tzyi09k.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 56EA96EC7D for ; Thu, 28 Apr 2016 08:54:07 +0000 (UTC) In-Reply-To: <878tzyi09k.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville =?utf-8?B?U3lyasOkbMOk?= , Chris Wilson Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAyOCBBcHIgMjAxNiwgSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVs LmNvbT4gd3JvdGU6Cj4gT24gRnJpLCAyMCBOb3YgMjAxNSwgVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4+IE9uIEZyaSwgTm92IDIwLCAyMDE1 IGF0IDAzOjExOjA0UE0gKzAwMDAsIENocmlzIFdpbHNvbiB3cm90ZToKPj4+IFRoZSBvZmZzZXQg d2l0aGluIGFuZCB0aGUgbGVuZ3RoIG9mIHRoZSBjb21tYW5kIHNlcXVlbmNlIHRvIGV4ZWN1dGUg YXJlCj4+PiBzdXBwbGllZCBieSB0aGUgdXNlciB3aXRoIHJlc3BlY3QgdG8gdGhlIGJhdGNoIGJ1 ZmZlci4gV2Ugc2hvdWxkIGJlCj4+PiB2YWxpZGF0aW5nIHRoYXQgcmVnaW9uIGlzIHdob2xseSBj b250YWluZWQgd2l0aGluIHRoZSBiYXRjaCBidWZmZXI7Cj4+PiBtYWtlIGl0IHNvLgo+Pj4gCj4+ PiBSZXBvcnRlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KPj4+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgo+Pj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPj4+IC0tLQo+Pj4gIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8IDcgKysrKysrKwo+Pj4gIDEg ZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKykKPj4+IAo+Pj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwo+Pj4gaW5kZXggYTRjMjQzY2VjNGFhLi5lMzgyODRj MWI4OWYgMTAwNjQ0Cj4+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKPj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZm ZXIuYwo+Pj4gQEAgLTE0NjIsNiArMTQ2MiwxMyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4+PiAgCS8qIHRha2Ugbm90ZSBvZiB0 aGUgYmF0Y2ggYnVmZmVyIGJlZm9yZSB3ZSBtaWdodCByZW9yZGVyIHRoZSBsaXN0cyAqLwo+Pj4g IAliYXRjaF9vYmogPSBlYl9nZXRfYmF0Y2goZWIpOwo+Pj4gIAo+Pj4gKwlpZiAoYXJncy0+YmF0 Y2hfbGVuID4gYmF0Y2hfb2JqLT5iYXNlLnNpemUgfHwKPj4+ICsJICAgIGFyZ3MtPmJhdGNoX3N0 YXJ0X29mZnNldCA+IGJhdGNoX29iai0+YmFzZS5zaXplIC0gYXJncy0+YmF0Y2hfbGVuKSB7Cj4+ Cj4+IGxndG0uIE5vIHBvc3NpYmlsaXR5IG9mIG92ZXJmbG93IGRvaW5nIGl0IHRoYXQgd2F5Lgo+ Pgo+PiBSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbT4KCkkgZG9uJ3Qga25vdyB3aGF0IEkgZmF0IGZpbmdlcmVkIHdpdGggdGhlIHByZXZp b3VzIG1haWwsIGJ1dCBJIGp1c3QKc3R1bWJsZWQgdXBvbiB0aGlzIHBhdGNoIGFuZCBub3RpY2Vk IGl0IG5ldmVyIG1hZGUgaXQuIElzIHRoaXMgc3RpbGwKdmFsaWQ/CgpCUiwKSmFuaS4KCgo+Pgo+ Pj4gKwkJRFJNX0RFQlVHKCJBdHRlbXB0aW5nIHRvIGV4ZWN1dGUgY29tbWFuZHMgZnJvbSBiZXlv bmQgdGhlIGJvdW5kcyBvZiB0aGUgYmF0Y2ggb2JqZWN0XG4iKTsKPj4+ICsJCXJldCA9IC1FSU5W QUw7Cj4+PiArCQlnb3RvIGVycjsKPj4+ICsJfQo+Pj4gKwo+Pj4gIAkvKiBNb3ZlIHRoZSBvYmpl Y3RzIGVuLW1hc3NlIGludG8gdGhlIEdUVCwgZXZpY3RpbmcgaWYgbmVjZXNzYXJ5LiAqLwo+Pj4g IAluZWVkX3JlbG9jcyA9IChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19OT19SRUxPQykgPT0gMDsK Pj4+ICAJcmV0ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXNlcnZlKHJpbmcsICZlYi0+dm1hcywg Y3R4LCAmbmVlZF9yZWxvY3MpOwo+Pj4gLS0gCj4+PiAyLjYuMgo+Pj4gCj4+PiBfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+Pj4gSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdAo+Pj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+Pj4gaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkphbmkg TmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:13328 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153AbcD1IyH convert rfc822-to-8bit (ORCPT ); Thu, 28 Apr 2016 04:54:07 -0400 From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= , Chris Wilson Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Validate execbuffer start/length arguments against the target bo In-Reply-To: <878tzyi09k.fsf@intel.com> References: <1448032264-31086-1-git-send-email-chris@chris-wilson.co.uk> <20151120153825.GS4437@intel.com> <878tzyi09k.fsf@intel.com> Date: Thu, 28 Apr 2016 11:54:04 +0300 Message-ID: <8760v2i05v.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, 28 Apr 2016, Jani Nikula wrote: > On Fri, 20 Nov 2015, Ville Syrjälä wrote: >> On Fri, Nov 20, 2015 at 03:11:04PM +0000, Chris Wilson wrote: >>> The offset within and the length of the command sequence to execute are >>> supplied by the user with respect to the batch buffer. We should be >>> validating that region is wholly contained within the batch buffer; >>> make it so. >>> >>> Reported-by: Ville Syrjälä >>> Signed-off-by: Chris Wilson >>> Cc: stable@vger.kernel.org >>> --- >>> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 +++++++ >>> 1 file changed, 7 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c >>> index a4c243cec4aa..e38284c1b89f 100644 >>> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c >>> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c >>> @@ -1462,6 +1462,13 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, >>> /* take note of the batch buffer before we might reorder the lists */ >>> batch_obj = eb_get_batch(eb); >>> >>> + if (args->batch_len > batch_obj->base.size || >>> + args->batch_start_offset > batch_obj->base.size - args->batch_len) { >> >> lgtm. No possibility of overflow doing it that way. >> >> Reviewed-by: Ville Syrjälä I don't know what I fat fingered with the previous mail, but I just stumbled upon this patch and noticed it never made it. Is this still valid? BR, Jani. >> >>> + DRM_DEBUG("Attempting to execute commands from beyond the bounds of the batch object\n"); >>> + ret = -EINVAL; >>> + goto err; >>> + } >>> + >>> /* Move the objects en-masse into the GTT, evicting if necessary. */ >>> need_relocs = (args->flags & I915_EXEC_NO_RELOC) == 0; >>> ret = i915_gem_execbuffer_reserve(ring, &eb->vmas, ctx, &need_relocs); >>> -- >>> 2.6.2 >>> >>> _______________________________________________ >>> Intel-gfx mailing list >>> Intel-gfx@lists.freedesktop.org >>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center