From: Sasha Levin <sashal@kernel.org>
Date: Thu, 21 Mar 2019 05:47:46 +0000 (-0400)
Subject: fixes for fixes for 4.14
X-Git-Tag: v3.18.137~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61d66d64b7dc831c43d0c5447d2357d708baa44d;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/drm-i915-relax-mmap-vma-check.patch b/queue-4.14/drm-i915-relax-mmap-vma-check.patch
new file mode 100644
index 00000000000..fea7be16b92
--- /dev/null
+++ b/queue-4.14/drm-i915-relax-mmap-vma-check.patch
@@ -0,0 +1,50 @@
+From e6e06b3feafff4a9eed796d85e744233a08058d6 Mon Sep 17 00:00:00 2001
+From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Date: Tue, 5 Mar 2019 11:04:08 +0000
+Subject: drm/i915: Relax mmap VMA check
+
+[ 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 <tvrtko.ursulin@intel.com>
+Fixes: 5c4604e757ba ("drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set")
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Cc: Adam Zabrocki <adamza@microsoft.com>
+Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+Cc: <stable@vger.kernel.org> # v4.0+
+Cc: Akash Goel <akash.goel@intel.com>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Jani Nikula <jani.nikula@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Cc: intel-gfx@lists.freedesktop.org
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+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 <rodrigo.vivi@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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 5d8a67c65141..727018a16cca 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -1640,7 +1640,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
+
diff --git a/queue-4.14/series b/queue-4.14/series
index 42c6f45b3fc..1e433a97a39 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -127,3 +127,4 @@ intel_th-don-t-reference-unassigned-outputs.patch
 parport_pc-fix-find_superio-io-compare-code-should-use-equal-test.patch
 i2c-tegra-fix-maximum-transfer-size.patch
 crypto-arm64-aes-neonbs-fix-returning-final-keystream-block.patch
+drm-i915-relax-mmap-vma-check.patch