Commit 1e8123fd authored by John Johansen's avatar John Johansen Committed by Linus Torvalds

Remove redundant check from proc_setattr()

notify_change() already calls security_inode_setattr() before
calling iop->setattr.
Signed-off-by: default avatarTony Jones <tonyj@suse.de>
Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarJohn Johansen <jjohansen@suse.de>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49a4ec18
...@@ -347,11 +347,8 @@ static int proc_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -347,11 +347,8 @@ static int proc_setattr(struct dentry *dentry, struct iattr *attr)
return -EPERM; return -EPERM;
error = inode_change_ok(inode, attr); error = inode_change_ok(inode, attr);
if (!error) { if (!error)
error = security_inode_setattr(dentry, attr); error = inode_setattr(inode, attr);
if (!error)
error = inode_setattr(inode, attr);
}
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment