Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

5 files changed, 37 insertions, 30 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 4e776f9c80e7..59302fc3643b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -599,15 +599,16 @@ static int mq_attr_ok(struct mq_attr *attr)
 static struct file *do_create(struct dentry *dir, struct dentry *dentry,
                         int oflag, mode_t mode, struct mq_attr __user *u_attr)
 {
-        struct file *filp;
         struct mq_attr attr;
         int ret;
 
-        if (u_attr != NULL) {
+        if (u_attr) {
+                ret = -EFAULT;
                 if (copy_from_user(&attr, u_attr, sizeof(attr)))
-                        return ERR_PTR(-EFAULT);
+                        goto out;
+                ret = -EINVAL;
                 if (!mq_attr_ok(&attr))
-                        return ERR_PTR(-EINVAL);
+                        goto out;
                 /* store for use during create */
                 dentry->d_fsdata = &attr;
         }
@@ -616,13 +617,14 @@ static struct file *do_create(struct dentry *dir, struct dentry *dentry,
         ret = vfs_create(dir->d_inode, dentry, mode, NULL);
         dentry->d_fsdata = NULL;
         if (ret)
-                return ERR_PTR(ret);
+                goto out;
 
-        filp = dentry_open(dentry, mqueue_mnt, oflag);
-        if (!IS_ERR(filp))
-                dget(dentry);
+        return dentry_open(dentry, mqueue_mnt, oflag);
 
-        return filp;
+out:
+        dput(dentry);
+        mntput(mqueue_mnt);
+        return ERR_PTR(ret);
 }
 
 /* Opens existing queue */
@@ -630,20 +632,20 @@ static struct file *do_open(struct dentry *dentry, int oflag)
 {
 static int oflag2acc[O_ACCMODE] = { MAY_READ, MAY_WRITE,
                                         MAY_READ | MAY_WRITE };
-        struct file *filp;
 
-        if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY))
+        if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY)) {
+                dput(dentry);
+                mntput(mqueue_mnt);
                 return ERR_PTR(-EINVAL);
+        }
 
-        if (permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE], NULL))
+        if (permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE], NULL)) {
+                dput(dentry);
+                mntput(mqueue_mnt);
                 return ERR_PTR(-EACCES);
+        }
 
-        filp = dentry_open(dentry, mqueue_mnt, oflag);
-
-        if (!IS_ERR(filp))
-                dget(dentry);
-
-        return filp;
+        return dentry_open(dentry, mqueue_mnt, oflag);
 }
 
 asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
@@ -671,17 +673,20 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
 
         if (oflag & O_CREAT) {
                 if (dentry->d_inode) {  /* entry already exists */
-                        filp = (oflag & O_EXCL) ? ERR_PTR(-EEXIST) :
-                                        do_open(dentry, oflag);
+                        error = -EEXIST;
+                        if (oflag & O_EXCL)
+                                goto out;
+                        filp = do_open(dentry, oflag);
                 } else {
                         filp = do_create(mqueue_mnt->mnt_root, dentry,
                                                 oflag, mode, u_attr);
                 }
-        } else
-                filp = (dentry->d_inode) ? do_open(dentry, oflag) :
-                                        ERR_PTR(-ENOENT);
-
-        dput(dentry);
+        } else {
+                error = -ENOENT;
+                if (!dentry->d_inode)
+                        goto out;
+                filp = do_open(dentry, oflag);
+        }
 
         if (IS_ERR(filp)) {
                 error = PTR_ERR(filp);
@@ -692,8 +697,10 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
         fd_install(fd, filp);
         goto out_upsem;
 
-out_putfd:
+out:
+        dput(dentry);
         mntput(mqueue_mnt);
+out_putfd:
         put_unused_fd(fd);
 out_err:
         fd = error;
diff --git a/ipc/msg.c b/ipc/msg.c
index a91b64763b86..fbf757064a32 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -12,7 +12,7 @@
  *
  * mostly rewritten, threaded and wake-one semantics added
  * MSGMAX limit removed, sysctl's added
- * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  */
 
 #include <linux/capability.h>
diff --git a/ipc/sem.c b/ipc/sem.c
index 46bb8a678dec..31fd4027d2b5 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -56,7 +56,7 @@
  * /proc/sysvipc/sem support (c) 1999 Dragos Acostachioaie <dragos@iname.com>
  *
  * SMP-threaded, sysctl's added
- * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  * Enforced range limit on SEM_UNDO
  * (c) 2001 Red Hat Inc <alan@redhat.com>
  * Lockless wakeup
diff --git a/ipc/util.c b/ipc/util.c
index 38b9a0af3bd8..862621980b01 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -7,7 +7,7 @@
  *            Occurs in several places in the IPC code.
  *            Chris Evans, <chris@ferret.lmh.ox.ac.uk>
  * Nov 1999 - ipc helper functions, unified SMP locking
- *            Manfred Spraul <manfreds@colorfullife.com>
+ *            Manfred Spraul <manfred@colorfullife.com>
  * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary().
  *            Mingming Cao <cmm@us.ibm.com>
  */
diff --git a/ipc/util.h b/ipc/util.h
index fc9a28be0797..efaff3ee7de7 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -2,7 +2,7 @@
  * linux/ipc/util.h
  * Copyright (C) 1999 Christoph Rohland
  *
- * ipc helper functions (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * ipc helper functions (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  */
 
 #ifndef _IPC_UTIL_H