Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2015-05-21 16:05:52 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-06-23 18:01:08 -0400
commit2426f3910069ed47c0cc58559a6d088af7920201 (patch)
tree88c802202a7ae166f8da96ce3bcf43970eb314cd
parentc0c3a718e3ab2430a52a60d614b109e5e48e83e2 (diff)
fs: Fix S_NOSEC handling
file_remove_suid() could mistakenly set S_NOSEC inode bit when root was modifying the file. As a result following writes to the file by ordinary user would avoid clearing suid or sgid bits. Fix the bug by checking actual mode bits before setting S_NOSEC. CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c
index e8d62688ed91..07f4cb5eab4b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1706,8 +1706,8 @@ int file_remove_suid(struct file *file)
error = security_inode_killpriv(dentry);
if (!error && killsuid)
error = __remove_suid(dentry, killsuid);
- if (!error && (inode->i_sb->s_flags & MS_NOSEC))
- inode->i_flags |= S_NOSEC;
+ if (!error)
+ inode_has_no_xattr(inode);
return error;
}