From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.9 085/118] drm/i915: Relax mmap VMA check Date: Fri, 22 Mar 2019 12:15:57 +0100 Message-ID: <20190322111222.612208265@linuxfoundation.org> References: <20190322111215.873964544@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 A75086E346 for ; Fri, 22 Mar 2019 11:44:52 +0000 (UTC) In-Reply-To: <20190322111215.873964544@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 NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KClsgVXBzdHJlYW0gY29tbWl0 IGNhMjJmMzJhNjI5NmNiZmEyOWRlNTYzMjhjODUwNTU2MGExOGNmYTggXQoKTGVnYWN5IGJlaGF2 aW91ciB3YXMgdG8gYWxsb3cgbm9uLXBhZ2UtYWxpZ25lZCBtbWFwIHJlcXVlc3RzLCBhcyBkb2Vz IHRoZQpsaW51eCBtbWFwKDIpIGltcGxlbWVudGF0aW9uIGJ5IHZpcnR1ZSBvZiBhdXRvbWF0aWNh bGx5IHJvdW5kaW5nIHVwIGZvcgp0aGUgY2FsbGVyLgoKVG8gYXZvaWQgYnJlYWtpbmcgbGVnYWN5 IHVzZXJzcGFjZSByZWxheCB0aGUgbmV3bHkgaW50cm9kdWNlZCBmaXguCgpTaWduZWQtb2ZmLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpGaXhlczogNWM0NjA0 ZTc1N2JhICgiZHJtL2k5MTU6IFByZXZlbnQgYSByYWNlIGR1cmluZyBJOTE1X0dFTV9NTUFQIGlv Y3RsIHdpdGggV0Mgc2V0IikKUmVwb3J0ZWQtYnk6IEd1ZW50ZXIgUm9lY2sgPGxpbnV4QHJvZWNr LXVzLm5ldD4KQ2M6IEFkYW0gWmFicm9ja2kgPGFkYW16YUBtaWNyb3NvZnQuY29tPgpDYzogSm9v bmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogPHN0YWJs ZUB2Z2VyLmtlcm5lbC5vcmc+ICMgdjQuMCsKQ2M6IEFrYXNoIEdvZWwgPGFrYXNoLmdvZWxAaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBK YW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZp IDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogaW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE5 MDMwNTExMDQwOS4yODYzMy0xLXR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNvbQooY2hlcnJ5 IHBpY2tlZCBmcm9tIGNvbW1pdCBhOTBlMTk0OGVmYjY0OGY1Njc0NDRmODdmM2MxOWIyYTA3ODdh ZmZkKQpTaWduZWQtb2ZmLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+ ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgICAgMyArKy0KIDEgZmlsZSBjaGFuZ2VkLCAy IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTYw MCw3ICsxNjAwLDggQEAgX192bWFfbWF0Y2hlcyhzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYQog CWlmICh2bWEtPnZtX2ZpbGUgIT0gZmlscCkKIAkJcmV0dXJuIGZhbHNlOwogCi0JcmV0dXJuIHZt YS0+dm1fc3RhcnQgPT0gYWRkciAmJiAodm1hLT52bV9lbmQgLSB2bWEtPnZtX3N0YXJ0KSA9PSBz aXplOworCXJldHVybiB2bWEtPnZtX3N0YXJ0ID09IGFkZHIgJiYKKwkgICAgICAgKHZtYS0+dm1f ZW5kIC0gdm1hLT52bV9zdGFydCkgPT0gUEFHRV9BTElHTihzaXplKTsKIH0KIAogLyoqCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 46C13C43381 for ; Fri, 22 Mar 2019 11:44:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 162652196F for ; Fri, 22 Mar 2019 11:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255098; bh=xYFi3/bBWwRjcEhh5G16jq25FQ2lpe98kxIJ5cIuKnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0o+EB5dm9CAMU6R2/DJQczWWrDLQA0lysDcDtioThq2N0kDVnURdwrmrxinAnoFUo GY0LhO2TTFZP0/ZyM2GTehL8Fp/MHC1czBG76tQ/qh3loUQOAVrmDHuOB82rMaKtX6 8IaHCAnYA1W59eOhY+4F9vXVX3QH63PpKxfLmrMI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731901AbfCVLo4 (ORCPT ); Fri, 22 Mar 2019 07:44:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731874AbfCVLox (ORCPT ); Fri, 22 Mar 2019 07:44:53 -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 06DE22082C; Fri, 22 Mar 2019 11:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255092; bh=xYFi3/bBWwRjcEhh5G16jq25FQ2lpe98kxIJ5cIuKnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pL/sLmrtviywxxhzOD4c4iSAMOCTtC+b87YmSmTMvVfzJbVh6f03lgM90tsP0M2lS cVF05TCuQVWR1hiTsfgJOtea9I4G9PYFPvO9JnkAoKDJfDx87i/egFuxCXYybYSuVr N/d9fm8iy21xKGa8J30900U15gn2Cv6zDNNqR+tA= 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.9 085/118] drm/i915: Relax mmap VMA check Date: Fri, 22 Mar 2019 12:15:57 +0100 Message-Id: <20190322111222.612208265@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111215.873964544@linuxfoundation.org> References: <20190322111215.873964544@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.9-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(-) --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1600,7 +1600,8 @@ __vma_matches(struct vm_area_struct *vma 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); } /**