diff options
| author | Jan Kara <jack@suse.cz> | 2015-05-21 16:05:52 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-07-30 14:10:43 +0200 |
| commit | c37fe1ff09c1f900828659bc9fbeb7ff627d7c21 (patch) | |
| tree | f62563044acf03bcb684c5f137198ba23f29a7aa /fs | |
| parent | 67b3047b7ab80b80bca93a92e3aa9c4a7ea3e717 (diff) | |
fs: Fix S_NOSEC handling
commit 2426f3910069ed47c0cc58559a6d088af7920201 upstream.
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.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index d9134a0f5dd9..9ec57cb0aacd 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1599,8 +1599,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; } |