2007-04-03 12:04:05 +00:00
|
|
|
Remove redundant check from proc_sys_setattr()
|
2007-02-15 11:55:00 +00:00
|
|
|
|
2007-04-03 12:04:05 +00:00
|
|
|
This is similar to a recent fixup in proc_setattr(): notify_change()
|
|
|
|
|
already calls security_inode_setattr() before calling iop->setattr.
|
2007-02-15 11:55:00 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Steve Beattie <sbeattie@suse.de>
|
2007-04-03 12:04:05 +00:00
|
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
2007-02-15 11:55:00 +00:00
|
|
|
|
|
|
|
|
Index: b/fs/proc/proc_sysctl.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- a/fs/proc/proc_sysctl.c
|
|
|
|
|
+++ b/fs/proc/proc_sysctl.c
|
|
|
|
|
@@ -429,11 +429,8 @@ static int proc_sys_setattr(struct dentr
|
|
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
|
|
error = inode_change_ok(inode, attr);
|
|
|
|
|
- if (!error) {
|
|
|
|
|
- error = security_inode_setattr(dentry, attr);
|
|
|
|
|
- if (!error)
|
|
|
|
|
- error = inode_setattr(inode, attr);
|
|
|
|
|
- }
|
|
|
|
|
+ if (!error)
|
|
|
|
|
+ error = inode_setattr(inode, attr);
|
|
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
}
|
