4 files changed, 42 insertions, 35 deletions

diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index 0dfebc509426..4a7a12c95abe 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -26,29 +26,6 @@ static void *get_ipc(ctl_table *table)
         return which;
 }
 
-/*
- * Routine that is called when the file "auto_msgmni" has successfully been
- * written.
- * Two values are allowed:
- * 0: unregister msgmni's callback routine from the ipc namespace notifier
- *    chain. This means that msgmni won't be recomputed anymore upon memory
- *    add/remove or ipc namespace creation/removal.
- * 1: register back the callback routine.
- */
-static void ipc_auto_callback(int val)
-{
-        if (!val)
-                unregister_ipcns_notifier(current->nsproxy->ipc_ns);
-        else {
-                /*
-                 * Re-enable automatic recomputing only if not already
-                 * enabled.
-                 */
-                recompute_msgmni(current->nsproxy->ipc_ns);
-                cond_register_ipcns_notifier(current->nsproxy->ipc_ns);
-        }
-}
-
 #ifdef CONFIG_PROC_FS
 static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
         void __user *buffer, size_t *lenp, loff_t *ppos)
@@ -94,6 +71,29 @@ static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
                                         lenp, ppos);
 }
 
+/*
+ * Routine that is called when the file "auto_msgmni" has successfully been
+ * written.
+ * Two values are allowed:
+ * 0: unregister msgmni's callback routine from the ipc namespace notifier
+ *    chain. This means that msgmni won't be recomputed anymore upon memory
+ *    add/remove or ipc namespace creation/removal.
+ * 1: register back the callback routine.
+ */
+static void ipc_auto_callback(int val)
+{
+        if (!val)
+                unregister_ipcns_notifier(current->nsproxy->ipc_ns);
+        else {
+                /*
+                 * Re-enable automatic recomputing only if not already
+                 * enabled.
+                 */
+                recompute_msgmni(current->nsproxy->ipc_ns);
+                cond_register_ipcns_notifier(current->nsproxy->ipc_ns);
+        }
+}
+
 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
         struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos)
 {
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index eddb6247a553..23fdb8492b8e 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -505,7 +505,8 @@ static void __do_notify(struct mqueue_inode_info *info)
                         sig_i.si_errno = 0;
                         sig_i.si_code = SI_MESGQ;
                         sig_i.si_value = info->notify.sigev_value;
-                        sig_i.si_pid = task_tgid_vnr(current);
+                        sig_i.si_pid = task_tgid_nr_ns(current,
+                                                ns_of_pid(info->notify_owner));
                         sig_i.si_uid = current_uid();
 
                         kill_pid_info(info->notify.sigev_signo,
diff --git a/ipc/sem.c b/ipc/sem.c
index fea0ad3aed7b..c68cd3f8f0c9 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1216,7 +1216,6 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
         if (timeout && jiffies_left == 0)
                 error = -EAGAIN;
         list_del(&queue.list);
-        goto out_unlock_free;
 
 out_unlock_free:
         sem_unlock(sma);
diff --git a/ipc/shm.c b/ipc/shm.c
index 57dd50046cef..d0ab5527bf45 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -75,7 +75,7 @@ void shm_init_ns(struct ipc_namespace *ns)
         ns->shm_ctlall = SHMALL;
         ns->shm_ctlmni = SHMMNI;
         ns->shm_tot = 0;
-        ipc_init_ids(&ns->ids[IPC_SHM_IDS]);
+        ipc_init_ids(&shm_ids(ns));
 }
 
 /*
@@ -644,7 +644,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                 if (err)
                         return err;
 
-                memset(&shminfo,0,sizeof(shminfo));
+                memset(&shminfo, 0, sizeof(shminfo));
                 shminfo.shmmni = shminfo.shmseg = ns->shm_ctlmni;
                 shminfo.shmmax = ns->shm_ctlmax;
                 shminfo.shmall = ns->shm_ctlall;
@@ -669,7 +669,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                 if (err)
                         return err;
 
-                memset(&shm_info,0,sizeof(shm_info));
+                memset(&shm_info, 0, sizeof(shm_info));
                 down_read(&shm_ids(ns).rw_mutex);
                 shm_info.used_ids = shm_ids(ns).in_use;
                 shm_get_stat (ns, &shm_info.shm_rss, &shm_info.shm_swp);
@@ -678,7 +678,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                 shm_info.swap_successes = 0;
                 err = ipc_get_maxid(&shm_ids(ns));
                 up_read(&shm_ids(ns).rw_mutex);
-                if(copy_to_user (buf, &shm_info, sizeof(shm_info))) {
+                if (copy_to_user(buf, &shm_info, sizeof(shm_info))) {
                         err = -EFAULT;
                         goto out;
                 }
@@ -692,11 +692,6 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                 struct shmid64_ds tbuf;
                 int result;
 
-                if (!buf) {
-                        err = -EFAULT;
-                        goto out;
-                }
-
                 if (cmd == SHM_STAT) {
                         shp = shm_lock(ns, shmid);
                         if (IS_ERR(shp)) {
@@ -712,7 +707,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                         }
                         result = 0;
                 }
-                err=-EACCES;
+                err = -EACCES;
                 if (ipcperms (&shp->shm_perm, S_IRUGO))
                         goto out_unlock;
                 err = security_shm_shmctl(shp, cmd);
@@ -995,6 +990,7 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
          */
         vma = find_vma(mm, addr);
 
+#ifdef CONFIG_MMU
         while (vma) {
                 next = vma->vm_next;
 
@@ -1039,6 +1035,17 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
                 vma = next;
         }
 
+#else /* CONFIG_MMU */
+        /* under NOMMU conditions, the exact address to be destroyed must be
+         * given */
+        retval = -EINVAL;
+        if (vma->vm_start == addr && vma->vm_ops == &shm_vm_ops) {
+                do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start);
+                retval = 0;
+        }
+
+#endif
+
         up_write(&mm->mmap_sem);
         return retval;
 }