diff --git a/[refs] b/[refs]
index 720aec24538e..cee3cdd9dab2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38885bd4c2a4b59ddb22271d3e6c621859c76f02
+refs/heads/master: df1e2fb540368d0f9640045235f81923fa63acb7
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 9162123a7b23..16fe2786087d 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -814,6 +814,9 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
 	loff_t size = 0;
 	int retval = -EINVAL;
 
+	if (addr & ~PAGE_MASK)
+		return retval;
+
 	down_write(&mm->mmap_sem);
 
 	/*