openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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 <mszeredi@suse.cz>
This commit is contained in:
Miklos Szeredi 2008-07-30 14:06:22 +02:00 committed by Al Viro
parent 2c512397ca
commit a77b72da24
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/attr.c
View File

@ -159,17 +159,17 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
if (!(attr->ia_valid & ~(ATTR_KILL_SUID | ATTR_KILL_SGID))) if (!(attr->ia_valid & ~(ATTR_KILL_SUID | ATTR_KILL_SGID)))
return 0; return 0;
error = security_inode_setattr(dentry, attr);
if (error)
return error;
if (ia_valid & ATTR_SIZE) if (ia_valid & ATTR_SIZE)
down_write(&dentry->d_inode->i_alloc_sem); down_write(&dentry->d_inode->i_alloc_sem);
if (inode->i_op && inode->i_op->setattr) { if (inode->i_op && inode->i_op->setattr) {
error = security_inode_setattr(dentry, attr); error = inode->i_op->setattr(dentry, attr);
if (!error)
error = inode->i_op->setattr(dentry, attr);
} else { } else {
error = inode_change_ok(inode, attr); error = inode_change_ok(inode, attr);
if (!error)
error = security_inode_setattr(dentry, attr);
if (!error) { if (!error) {
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))