diff --git a/[refs] b/[refs]
index a92ab975f813..f797de6696a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22db9412736204b25aeba19d18e5ea922f7d632
+refs/heads/master: 8e36709d8cea48a4d341294ce2b46678a2e77159
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 4c28d2d8e305..9162123a7b23 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -870,6 +870,7 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
 	 * could possibly have landed at. Also cast things to loff_t to
 	 * prevent overflows and make comparisions vs. equal-width types.
 	 */
+	size = PAGE_ALIGN(size);
 	while (vma && (loff_t)(vma->vm_end - addr) <= size) {
 		next = vma->vm_next;