|
@@ -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))
|