apparmor/kernel-patches/for-mainline/proc_sys_setattr.diff
2007-02-15 11:55:00 +00:00

29 lines
792 B
Diff

Remove redundant check from proc_sys_setattr(), similar to recent fixup
in proc_setattr().
notify_change() already calls security_inode_setattr() before
calling iop->setattr.
Signed-off-by: Steve Beattie <sbeattie@suse.de>
---
fs/proc/proc_sysctl.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
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;
}