From d77b84ba3b0b0d53f4fe7755679bb0eb3346a814 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 22 Oct 2012 15:58:26 +0200
Subject: [PATCH] --- yaml --- r: 335685 b: refs/heads/master c:
 516bad44b9f3bdcb0be6be0252b7557bf7a149e4 h: refs/heads/master i:   335683:
 a4447e2ab7c12a55c11efc5a40c71f09279caacf v: v3

---
 [refs]                   | 2 +-
 trunk/arch/s390/mm/gup.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c7685cba0550..7b7393924aa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d55c4c613fc4d4ad2ba0fc6fa2b57176d420f7e4
+refs/heads/master: 516bad44b9f3bdcb0be6be0252b7557bf7a149e4
diff --git a/trunk/arch/s390/mm/gup.c b/trunk/arch/s390/mm/gup.c
index 16fb3c1615dc..1f5315d1215c 100644
--- a/trunk/arch/s390/mm/gup.c
+++ b/trunk/arch/s390/mm/gup.c
@@ -180,8 +180,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
 	addr = start;
 	len = (unsigned long) nr_pages << PAGE_SHIFT;
 	end = start + len;
-	if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
-					(void __user *)start, len)))
+	if ((end < start) || (end > TASK_SIZE))
 		return 0;
 
 	local_irq_save(flags);