From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53EFDC43381 for ; Mon, 18 Mar 2019 12:55:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E4C720857 for ; Mon, 18 Mar 2019 12:55:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbfCRMzS convert rfc822-to-8bit (ORCPT ); Mon, 18 Mar 2019 08:55:18 -0400 Received: from mga11.intel.com ([192.55.52.93]:56814 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726612AbfCRMzS (ORCPT ); Mon, 18 Mar 2019 08:55:18 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Mar 2019 05:55:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,493,1544515200"; d="scan'208";a="141659674" Received: from jlahtine-desk.ger.corp.intel.com (HELO localhost) ([10.252.12.253]) by FMSMGA003.fm.intel.com with ESMTP; 18 Mar 2019 05:55:16 -0700 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Chris Wilson , intel-gfx@lists.freedesktop.org From: Joonas Lahtinen Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo In-Reply-To: <20190314075829.16838-1-chris@chris-wilson.co.uk> Cc: Chris Wilson , Antonio Argenziano , Tvrtko Ursulin , stable@vger.kernel.org References: <20190314075829.16838-1-chris@chris-wilson.co.uk> Message-ID: <155291371552.12760.9216348846176749522@jlahtine-desk.ger.corp.intel.com> User-Agent: alot/0.7 Subject: Re: [PATCH] drm/i915: Sanity check mmap length against object size Date: Mon, 18 Mar 2019 14:55:15 +0200 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Quoting Chris Wilson (2019-03-14 09:58:29) > We assumed that vm_mmap() would reject an attempt to mmap past the end of > the filp (our object), but we were wrong. > > Reported-by: Antonio Argenziano > Testcase: igt/gem_mmap/bad-size > Signed-off-by: Chris Wilson > Cc: Antonio Argenziano > Cc: Joonas Lahtinen > Cc: Tvrtko Ursulin > Cc: stable@vger.kernel.org With the SIGBUS => EINVAL difference documented this is: Reviewed-by: Joonas Lahtinen Regards, Joonas > --- > drivers/gpu/drm/i915/i915_gem.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index b38c9531b5e8..b7086c8d4726 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1639,8 +1639,13 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > * pages from. > */ > if (!obj->base.filp) { > - i915_gem_object_put(obj); > - return -ENXIO; > + addr = -ENXIO; > + goto err; > + } > + > + if (range_overflows(args->offset, args->size, (u64)obj->base.size)) { > + addr = -EINVAL; > + goto err; > } > > addr = vm_mmap(obj->base.filp, 0, args->size, > @@ -1654,8 +1659,8 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > struct vm_area_struct *vma; > > if (down_write_killable(&mm->mmap_sem)) { > - i915_gem_object_put(obj); > - return -EINTR; > + addr = -EINTR; > + goto err; > } > vma = find_vma(mm, addr); > if (vma && __vma_matches(vma, obj->base.filp, addr, args->size)) > @@ -1673,12 +1678,10 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > i915_gem_object_put(obj); > > args->addr_ptr = (u64)addr; > - > return 0; > > err: > i915_gem_object_put(obj); > - > return addr; > } > > -- > 2.20.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH] drm/i915: Sanity check mmap length against object size Date: Mon, 18 Mar 2019 14:55:15 +0200 Message-ID: <155291371552.12760.9216348846176749522@jlahtine-desk.ger.corp.intel.com> References: <20190314075829.16838-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <20190314075829.16838-1-chris@chris-wilson.co.uk> Sender: stable-owner@vger.kernel.org To: intel-gfx@lists.freedesktop.org Cc: Chris Wilson , Antonio Argenziano , Tvrtko Ursulin , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org Quoting Chris Wilson (2019-03-14 09:58:29) > We assumed that vm_mmap() would reject an attempt to mmap past the end of > the filp (our object), but we were wrong. > > Reported-by: Antonio Argenziano > Testcase: igt/gem_mmap/bad-size > Signed-off-by: Chris Wilson > Cc: Antonio Argenziano > Cc: Joonas Lahtinen > Cc: Tvrtko Ursulin > Cc: stable@vger.kernel.org With the SIGBUS => EINVAL difference documented this is: Reviewed-by: Joonas Lahtinen Regards, Joonas > --- > drivers/gpu/drm/i915/i915_gem.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index b38c9531b5e8..b7086c8d4726 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1639,8 +1639,13 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > * pages from. > */ > if (!obj->base.filp) { > - i915_gem_object_put(obj); > - return -ENXIO; > + addr = -ENXIO; > + goto err; > + } > + > + if (range_overflows(args->offset, args->size, (u64)obj->base.size)) { > + addr = -EINVAL; > + goto err; > } > > addr = vm_mmap(obj->base.filp, 0, args->size, > @@ -1654,8 +1659,8 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > struct vm_area_struct *vma; > > if (down_write_killable(&mm->mmap_sem)) { > - i915_gem_object_put(obj); > - return -EINTR; > + addr = -EINTR; > + goto err; > } > vma = find_vma(mm, addr); > if (vma && __vma_matches(vma, obj->base.filp, addr, args->size)) > @@ -1673,12 +1678,10 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > i915_gem_object_put(obj); > > args->addr_ptr = (u64)addr; > - > return 0; > > err: > i915_gem_object_put(obj); > - > return addr; > } > > -- > 2.20.1 >