From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.19 211/280] drm/i915: Relax mmap VMA check Date: Fri, 22 Mar 2019 12:16:04 +0100 Message-ID: <20190322111332.825969209@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 967F16E362 for ; Fri, 22 Mar 2019 12:07:42 +0000 (UTC) In-Reply-To: <20190322111306.356185024@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: Sasha Levin , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Akash Goel , Guenter Roeck , Adam Zabrocki List-Id: intel-gfx@lists.freedesktop.org NC4xOS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpbIFVwc3RyZWFtIGNvbW1p dCBjYTIyZjMyYTYyOTZjYmZhMjlkZTU2MzI4Yzg1MDU1NjBhMThjZmE4IF0KCkxlZ2FjeSBiZWhh dmlvdXIgd2FzIHRvIGFsbG93IG5vbi1wYWdlLWFsaWduZWQgbW1hcCByZXF1ZXN0cywgYXMgZG9l cyB0aGUKbGludXggbW1hcCgyKSBpbXBsZW1lbnRhdGlvbiBieSB2aXJ0dWUgb2YgYXV0b21hdGlj YWxseSByb3VuZGluZyB1cCBmb3IKdGhlIGNhbGxlci4KClRvIGF2b2lkIGJyZWFraW5nIGxlZ2Fj eSB1c2Vyc3BhY2UgcmVsYXggdGhlIG5ld2x5IGludHJvZHVjZWQgZml4LgoKU2lnbmVkLW9mZi1i eTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KRml4ZXM6IDVjNDYw NGU3NTdiYSAoImRybS9pOTE1OiBQcmV2ZW50IGEgcmFjZSBkdXJpbmcgSTkxNV9HRU1fTU1BUCBp b2N0bCB3aXRoIFdDIHNldCIpClJlcG9ydGVkLWJ5OiBHdWVudGVyIFJvZWNrIDxsaW51eEByb2Vj ay11cy5uZXQ+CkNjOiBBZGFtIFphYnJvY2tpIDxhZGFtemFAbWljcm9zb2Z0LmNvbT4KQ2M6IEpv b25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IDxzdGFi bGVAdmdlci5rZXJuZWwub3JnPiAjIHY0LjArCkNjOiBBa2FzaCBHb2VsIDxha2FzaC5nb2VsQGlu dGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzog SmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2 aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IGludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAx OTAzMDUxMTA0MDkuMjg2MzMtMS10dnJ0a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20KKGNoZXJy eSBwaWNrZWQgZnJvbSBjb21taXQgYTkwZTE5NDhlZmI2NDhmNTY3NDQ0Zjg3ZjNjMTliMmEwNzg3 YWZmZCkKU2lnbmVkLW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDMgKystCiAxIGZpbGUgY2hhbmdlZCwgMiBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg MjgwYzg1MTcxNGU2Li4wM2NkYTE5N2ZiNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt MTgyOCw3ICsxODI4LDggQEAgX192bWFfbWF0Y2hlcyhzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZt YSwgc3RydWN0IGZpbGUgKmZpbHAsCiAJaWYgKHZtYS0+dm1fZmlsZSAhPSBmaWxwKQogCQlyZXR1 cm4gZmFsc2U7CiAKLQlyZXR1cm4gdm1hLT52bV9zdGFydCA9PSBhZGRyICYmICh2bWEtPnZtX2Vu ZCAtIHZtYS0+dm1fc3RhcnQpID09IHNpemU7CisJcmV0dXJuIHZtYS0+dm1fc3RhcnQgPT0gYWRk ciAmJgorCSAgICAgICAodm1hLT52bV9lbmQgLSB2bWEtPnZtX3N0YXJ0KSA9PSBQQUdFX0FMSUdO KHNpemUpOwogfQogCiAvKioKLS0gCjIuMTkuMQoKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZng= 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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 175EDC43381 for ; Fri, 22 Mar 2019 12:07:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB65021939 for ; Fri, 22 Mar 2019 12:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256470; bh=I5DfUpWc4FkhWApzv8awRJ97Wee7r7iwYLBrP50ov9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RiI8wwCNIKI3WtRF+q0vD1SjSQ+Z+QzxfZaPFwHTZD1qxng8TdFbCXtbmQ5KxOC3/ KX3n4dq+vpFqJ2E7qF6XmCOUR+4AOe5fP9KyZsCYnj/HI8QfnY9dVXfFRS3GqbNY/v YWgbmG1/XdiT9aWBv/RNPoeBxMGJJdku5MMPz1HI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389080AbfCVMHt (ORCPT ); Fri, 22 Mar 2019 08:07:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:46086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389063AbfCVMHn (ORCPT ); Fri, 22 Mar 2019 08:07:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EBD7E206C0; Fri, 22 Mar 2019 12:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256462; bh=I5DfUpWc4FkhWApzv8awRJ97Wee7r7iwYLBrP50ov9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MDwmuMhyHEAgiZMBWy6JZq0yrnlc4SVb3Bkm2C73Zad9qIXr/Ar7fDIo+cEZ0hPOm KDXlea2FeRU89X7Pkd8LyGBjgFpVSgbhhjgbinDvoVA15PzrKqy4bK6BKDGmqMg7j+ 3hJlbzjRczct75AamxYxTrexxPf5wrp6XoZxCJEU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tvrtko Ursulin , Guenter Roeck , Adam Zabrocki , Joonas Lahtinen , Akash Goel , Chris Wilson , Jani Nikula , Rodrigo Vivi , intel-gfx@lists.freedesktop.org, Sasha Levin Subject: [PATCH 4.19 211/280] drm/i915: Relax mmap VMA check Date: Fri, 22 Mar 2019 12:16:04 +0100 Message-Id: <20190322111332.825969209@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit ca22f32a6296cbfa29de56328c8505560a18cfa8 ] Legacy behaviour was to allow non-page-aligned mmap requests, as does the linux mmap(2) implementation by virtue of automatically rounding up for the caller. To avoid breaking legacy userspace relax the newly introduced fix. Signed-off-by: Tvrtko Ursulin Fixes: 5c4604e757ba ("drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set") Reported-by: Guenter Roeck Cc: Adam Zabrocki Cc: Joonas Lahtinen Cc: # v4.0+ Cc: Akash Goel Cc: Chris Wilson Cc: Jani Nikula Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190305110409.28633-1-tvrtko.ursulin@linux.intel.com (cherry picked from commit a90e1948efb648f567444f87f3c19b2a0787affd) Signed-off-by: Rodrigo Vivi Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/i915_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 280c851714e6..03cda197fb6b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1828,7 +1828,8 @@ __vma_matches(struct vm_area_struct *vma, struct file *filp, if (vma->vm_file != filp) return false; - return vma->vm_start == addr && (vma->vm_end - vma->vm_start) == size; + return vma->vm_start == addr && + (vma->vm_end - vma->vm_start) == PAGE_ALIGN(size); } /** -- 2.19.1