Merge branch 'master'

2 files changed, 3 insertions, 1 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 59302fc3643b..fd2e26b6f966 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1018,7 +1018,8 @@ retry:
                                 goto out;
                         }
 
-                        ret = netlink_attachskb(sock, nc, 0, MAX_SCHEDULE_TIMEOUT);
+                        ret = netlink_attachskb(sock, nc, 0,
+                                        MAX_SCHEDULE_TIMEOUT, NULL);
                         if (ret == 1)
                                 goto retry;
                         if (ret) {
diff --git a/ipc/shm.c b/ipc/shm.c
index 4c28d2d8e305..9162123a7b23 100644
--- a/ipc/shm.c
+++ b/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;