---

yaml --- r: 335684 b: refs/heads/master c: d55c4c6 h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · 8dd9e40 · 8dd9e40
1 parent a4447e2
commit 8dd9e40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 
 	/*