4 files changed, 56 insertions, 65 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 41b72f02fa70..eddb6247a553 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -523,31 +523,27 @@ static void __do_notify(struct mqueue_inode_info *info)
         wake_up(&info->wait_q);
 }
 
-static long prepare_timeout(const struct timespec __user *u_arg)
+static long prepare_timeout(struct timespec *p)
 {
-        struct timespec ts, nowts;
+        struct timespec nowts;
         long timeout;
 
-        if (u_arg) {
-                if (unlikely(copy_from_user(&ts, u_arg,
-                                        sizeof(struct timespec))))
-                        return -EFAULT;
-
-                if (unlikely(ts.tv_nsec < 0 || ts.tv_sec < 0
-                        || ts.tv_nsec >= NSEC_PER_SEC))
+        if (p) {
+                if (unlikely(p->tv_nsec < 0 || p->tv_sec < 0
+                        || p->tv_nsec >= NSEC_PER_SEC))
                         return -EINVAL;
                 nowts = CURRENT_TIME;
                 /* first subtract as jiffies can't be too big */
-                ts.tv_sec -= nowts.tv_sec;
-                if (ts.tv_nsec < nowts.tv_nsec) {
-                        ts.tv_nsec += NSEC_PER_SEC;
-                        ts.tv_sec--;
+                p->tv_sec -= nowts.tv_sec;
+                if (p->tv_nsec < nowts.tv_nsec) {
+                        p->tv_nsec += NSEC_PER_SEC;
+                        p->tv_sec--;
                 }
-                ts.tv_nsec -= nowts.tv_nsec;
-                if (ts.tv_sec < 0)
+                p->tv_nsec -= nowts.tv_nsec;
+                if (p->tv_sec < 0)
                         return 0;
 
-                timeout = timespec_to_jiffies(&ts) + 1;
+                timeout = timespec_to_jiffies(p) + 1;
         } else
                 return MAX_SCHEDULE_TIMEOUT;
 
@@ -591,22 +587,18 @@ static int mq_attr_ok(struct mq_attr *attr)
  * Invoked when creating a new queue via sys_mq_open
  */
 static struct file *do_create(struct dentry *dir, struct dentry *dentry,
-                        int oflag, mode_t mode, struct mq_attr __user *u_attr)
+                        int oflag, mode_t mode, struct mq_attr *attr)
 {
         const struct cred *cred = current_cred();
-        struct mq_attr attr;
         struct file *result;
         int ret;
 
-        if (u_attr) {
-                ret = -EFAULT;
-                if (copy_from_user(&attr, u_attr, sizeof(attr)))
-                        goto out;
+        if (attr) {
                 ret = -EINVAL;
-                if (!mq_attr_ok(&attr))
+                if (!mq_attr_ok(attr))
                         goto out;
                 /* store for use during create */
-                dentry->d_fsdata = &attr;
+                dentry->d_fsdata = attr;
         }
 
         mode &= ~current->fs->umask;
@@ -663,11 +655,13 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
         struct dentry *dentry;
         struct file *filp;
         char *name;
+        struct mq_attr attr;
         int fd, error;
 
-        error = audit_mq_open(oflag, mode, u_attr);
-        if (error != 0)
-                return error;
+        if (u_attr && copy_from_user(&attr, u_attr, sizeof(struct mq_attr)))
+                return -EFAULT;
+
+        audit_mq_open(oflag, mode, u_attr ? &attr : NULL);
 
         if (IS_ERR(name = getname(u_name)))
                 return PTR_ERR(name);
@@ -693,7 +687,8 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
                         filp = do_open(dentry, oflag);
                 } else {
                         filp = do_create(mqueue_mnt->mnt_root, dentry,
-                                                oflag, mode, u_attr);
+                                                oflag, mode,
+                                                u_attr ? &attr : NULL);
                 }
         } else {
                 error = -ENOENT;
@@ -828,17 +823,22 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
         struct ext_wait_queue *receiver;
         struct msg_msg *msg_ptr;
         struct mqueue_inode_info *info;
+        struct timespec ts, *p = NULL;
         long timeout;
         int ret;
 
-        ret = audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout);
-        if (ret != 0)
-                return ret;
+        if (u_abs_timeout) {
+                if (copy_from_user(&ts, u_abs_timeout, 
+                                        sizeof(struct timespec)))
+                        return -EFAULT;
+                p = &ts;
+        }
 
         if (unlikely(msg_prio >= (unsigned long) MQ_PRIO_MAX))
                 return -EINVAL;
 
-        timeout = prepare_timeout(u_abs_timeout);
+        audit_mq_sendrecv(mqdes, msg_len, msg_prio, p);
+        timeout = prepare_timeout(p);
 
         ret = -EBADF;
         filp = fget(mqdes);
@@ -917,12 +917,17 @@ asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
         struct inode *inode;
         struct mqueue_inode_info *info;
         struct ext_wait_queue wait;
+        struct timespec ts, *p = NULL;
 
-        ret = audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout);
-        if (ret != 0)
-                return ret;
+        if (u_abs_timeout) {
+                if (copy_from_user(&ts, u_abs_timeout, 
+                                        sizeof(struct timespec)))
+                        return -EFAULT;
+                p = &ts;
+        }
 
-        timeout = prepare_timeout(u_abs_timeout);
+        audit_mq_sendrecv(mqdes, msg_len, 0, p);
+        timeout = prepare_timeout(p);
 
         ret = -EBADF;
         filp = fget(mqdes);
@@ -1002,17 +1007,17 @@ asmlinkage long sys_mq_notify(mqd_t mqdes,
         struct mqueue_inode_info *info;
         struct sk_buff *nc;
 
-        ret = audit_mq_notify(mqdes, u_notification);
-        if (ret != 0)
-                return ret;
-
-        nc = NULL;
-        sock = NULL;
-        if (u_notification != NULL) {
+        if (u_notification) {
                 if (copy_from_user(&notification, u_notification,
                                         sizeof(struct sigevent)))
                         return -EFAULT;
+        }
 
+        audit_mq_notify(mqdes, u_notification ? &notification : NULL);
+
+        nc = NULL;
+        sock = NULL;
+        if (u_notification != NULL) {
                 if (unlikely(notification.sigev_notify != SIGEV_NONE &&
                              notification.sigev_notify != SIGEV_SIGNAL &&
                              notification.sigev_notify != SIGEV_THREAD))
@@ -1149,11 +1154,7 @@ asmlinkage long sys_mq_getsetattr(mqd_t mqdes,
         omqstat = info->attr;
         omqstat.mq_flags = filp->f_flags & O_NONBLOCK;
         if (u_mqstat) {
-                ret = audit_mq_getsetattr(mqdes, &mqstat);
-                if (ret != 0) {
-                        spin_unlock(&info->lock);
-                        goto out_fput;
-                }
+                audit_mq_getsetattr(mqdes, &mqstat);
                 if (mqstat.mq_flags & O_NONBLOCK)
                         filp->f_flags |= O_NONBLOCK;
                 else
diff --git a/ipc/sem.c b/ipc/sem.c
index 082122469b17..fea0ad3aed7b 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -58,7 +58,7 @@
  * SMP-threaded, sysctl's added
  * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  * Enforced range limit on SEM_UNDO
- * (c) 2001 Red Hat Inc <alan@redhat.com>
+ * (c) 2001 Red Hat Inc
  * Lockless wakeup
  * (c) 2003 Manfred Spraul <manfred@colorfullife.com>
  *
diff --git a/ipc/shm.c b/ipc/shm.c
index 38a055758a9b..57dd50046cef 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -747,9 +747,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                         goto out;
                 }
 
-                err = audit_ipc_obj(&(shp->shm_perm));
-                if (err)
-                        goto out_unlock;
+                audit_ipc_obj(&(shp->shm_perm));
 
                 if (!capable(CAP_IPC_LOCK)) {
                         uid_t euid = current_euid();
diff --git a/ipc/util.c b/ipc/util.c
index 5a1808c774a2..7585a72e259b 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -624,10 +624,9 @@ void ipc_rcu_putref(void *ptr)
 int ipcperms (struct kern_ipc_perm *ipcp, short flag)
 {       /* flag will most probably be 0 or S_...UGO from <linux/stat.h> */
         uid_t euid = current_euid();
-        int requested_mode, granted_mode, err;
+        int requested_mode, granted_mode;
 
-        if (unlikely((err = audit_ipc_obj(ipcp))))
-                return err;
+        audit_ipc_obj(ipcp);
         requested_mode = (flag >> 6) | (flag >> 3) | flag;
         granted_mode = ipcp->mode;
         if (euid == ipcp->cuid ||
@@ -803,16 +802,10 @@ struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd,
                 goto out_up;
         }
 
-        err = audit_ipc_obj(ipcp);
-        if (err)
-                goto out_unlock;
-
-        if (cmd == IPC_SET) {
-                err = audit_ipc_set_perm(extra_perm, perm->uid,
+        audit_ipc_obj(ipcp);
+        if (cmd == IPC_SET)
+                audit_ipc_set_perm(extra_perm, perm->uid,
                                          perm->gid, perm->mode);
-                if (err)
-                        goto out_unlock;
-        }
 
         euid = current_euid();
         if (euid == ipcp->cuid ||
@@ -820,7 +813,6 @@ struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd,
                 return ipcp;
 
         err = -EPERM;
-out_unlock:
         ipc_unlock(ipcp);
 out_up:
         up_write(&ids->rw_mutex);