diff --git a/[refs] b/[refs]
index 3b865f6245f2..257546159a49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae09259ffe2402e956efd5a36220b6161e9ecb3
+refs/heads/master: 5ec1055aa5632dd7a8283cdb5fa9be3c535eaa06
diff --git a/trunk/mm/fremap.c b/trunk/mm/fremap.c
index 7b7f852848de..ec520c7b28df 100644
--- a/trunk/mm/fremap.c
+++ b/trunk/mm/fremap.c
@@ -141,6 +141,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 	if (start + size <= start)
 		return err;
 
+	/* Does pgoff wrap? */
+	if (pgoff + (size >> PAGE_SHIFT) < pgoff)
+		return err;
+
 	/* Can we represent this offset inside this architecture's pte's? */
 #if PTE_FILE_MAX_BITS < BITS_PER_LONG
 	if (pgoff + (size >> PAGE_SHIFT) >= (1UL << PTE_FILE_MAX_BITS))