aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorAndré Goddard Rosa2010-02-23 01:04:25 -0600
committerAl Viro2010-03-03 13:48:00 -0600
commit04db0dde0ee1c29110642dff57fba9e438eb805c (patch)
treeca80ec3e48470f70d233fcabf4c8d79c4b3c4bc7 /ipc
parent8834cf796a4320be2d3a70b1e4f9aba732a0f4ee (diff)
downloadkernel-common-04db0dde0ee1c29110642dff57fba9e438eb805c.tar.gz
kernel-common-04db0dde0ee1c29110642dff57fba9e438eb805c.tar.xz
kernel-common-04db0dde0ee1c29110642dff57fba9e438eb805c.zip
mqueue: simplify do_open() error handling
It reduces code size: text data bss dec hex filename 9925 72 16 10013 271d ipc/mqueue-BEFORE.o 9885 72 16 9973 26f5 ipc/mqueue-AFTER.o Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mqueue.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 15eabf9d51f..3853116a2ef 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -657,24 +657,28 @@ out:
657static struct file *do_open(struct ipc_namespace *ipc_ns, 657static struct file *do_open(struct ipc_namespace *ipc_ns,
658 struct dentry *dentry, int oflag) 658 struct dentry *dentry, int oflag)
659{ 659{
660 int ret;
660 const struct cred *cred = current_cred(); 661 const struct cred *cred = current_cred();
661 662
662 static const int oflag2acc[O_ACCMODE] = { MAY_READ, MAY_WRITE, 663 static const int oflag2acc[O_ACCMODE] = { MAY_READ, MAY_WRITE,
663 MAY_READ | MAY_WRITE }; 664 MAY_READ | MAY_WRITE };
664 665
665 if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY)) { 666 if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY)) {
666 dput(dentry); 667 ret = -EINVAL;
667 mntput(ipc_ns->mq_mnt); 668 goto err;
668 return ERR_PTR(-EINVAL);
669 } 669 }
670 670
671 if (inode_permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE])) { 671 if (inode_permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE])) {
672 dput(dentry); 672 ret = -EACCES;
673 mntput(ipc_ns->mq_mnt); 673 goto err;
674 return ERR_PTR(-EACCES);
675 } 674 }
676 675
677 return dentry_open(dentry, ipc_ns->mq_mnt, oflag, cred); 676 return dentry_open(dentry, ipc_ns->mq_mnt, oflag, cred);
677
678err:
679 dput(dentry);
680 mntput(ipc_ns->mq_mnt);
681 return ERR_PTR(ret);
678} 682}
679 683
680SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode, 684SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode,