]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[patch] vfs: make security_inode_setattr() calling consistent
authorMiklos Szeredi <mszeredi@suse.cz>
Wed, 30 Jul 2008 12:06:22 +0000 (14:06 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 23 Oct 2008 09:13:27 +0000 (05:13 -0400)
Call security_inode_setattr() consistetly before inode_change_ok().
It doesn't make sense to try to "optimize" the i_op->setattr == NULL
case, as most filesystem do define their own setattr function.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
fs/attr.c

index 26c71ba1eed49d2f500c9e8044e68693492a47ee..7a83819f6ba29144364f0f5769125d0ecb8f03f3 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -159,17 +159,17 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
        if (!(attr->ia_valid & ~(ATTR_KILL_SUID | ATTR_KILL_SGID)))
                return 0;
 
+       error = security_inode_setattr(dentry, attr);
+       if (error)
+               return error;
+
        if (ia_valid & ATTR_SIZE)
                down_write(&dentry->d_inode->i_alloc_sem);
 
        if (inode->i_op && inode->i_op->setattr) {
-               error = security_inode_setattr(dentry, attr);
-               if (!error)
-                       error = inode->i_op->setattr(dentry, attr);
+               error = inode->i_op->setattr(dentry, attr);
        } else {
                error = inode_change_ok(inode, attr);
-               if (!error)
-                       error = security_inode_setattr(dentry, attr);
                if (!error) {
                        if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
                            (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))