From: Miklos Szeredi Date: Wed, 30 Jul 2008 12:06:22 +0000 (+0200) Subject: [patch] vfs: make security_inode_setattr() calling consistent X-Git-Tag: v2.6.28-rc1~24^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a77b72da24ecfe262760874c55e3f6461f1dec0d;p=linux-2.6-omap-h63xx.git [patch] vfs: make security_inode_setattr() calling consistent 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 --- diff --git a/fs/attr.c b/fs/attr.c index 26c71ba1eed..7a83819f6ba 100644 --- 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))