From 8dd9e40d6a50ba251a75e0945bf2dbf389c79974 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 22 Oct 2012 15:49:02 +0200
Subject: [PATCH] --- yaml --- r: 335684 b: refs/heads/master c:
 d55c4c613fc4d4ad2ba0fc6fa2b57176d420f7e4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 17c5ea38ccee..c7685cba0550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 658e5ce705f2a09ab681eb61ca7c8619bb7a783d
+refs/heads/master: d55c4c613fc4d4ad2ba0fc6fa2b57176d420f7e4
diff --git a/trunk/arch/s390/mm/gup.c b/trunk/arch/s390/mm/gup.c
index 8b8285310b5a..16fb3c1615dc 100644
--- a/trunk/arch/s390/mm/gup.c
+++ b/trunk/arch/s390/mm/gup.c
@@ -229,7 +229,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 (end < start)
+	if ((end < start) || (end > TASK_SIZE))
 		goto slow_irqon;
 
 	/*