From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:49186 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759771AbbKTPi3 (ORCPT ); Fri, 20 Nov 2015 10:38:29 -0500 Date: Fri, 20 Nov 2015 17:38:25 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: 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 Message-ID: <20151120153825.GS4437@intel.com> References: <1448032264-31086-1-git-send-email-chris@chris-wilson.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1448032264-31086-1-git-send-email-chris@chris-wilson.co.uk> Sender: stable-owner@vger.kernel.org List-ID: 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� > + 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 -- Ville Syrj�l� Intel OTC