Commit 2426f391 authored by Jan Kara's avatar Jan Kara Committed by Al Viro

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c0c3a718
...@@ -1706,8 +1706,8 @@ int file_remove_suid(struct file *file) ...@@ -1706,8 +1706,8 @@ int file_remove_suid(struct file *file)
error = security_inode_killpriv(dentry); error = security_inode_killpriv(dentry);
if (!error && killsuid) if (!error && killsuid)
error = __remove_suid(dentry, killsuid); error = __remove_suid(dentry, killsuid);
if (!error && (inode->i_sb->s_flags & MS_NOSEC)) if (!error)
inode->i_flags |= S_NOSEC; inode_has_no_xattr(inode);
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