diff options
| author | Jan Kara <jack@suse.cz> | 2015-05-21 16:05:52 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:17 +0200 |
| commit | 40ce76dd060fd92f6f13398fd63c0df8dfd16d0a (patch) | |
| tree | f8eb78b96e4813e8f421bead1f28f8282572d8be /mm | |
| parent | 0b608389d6fb378bd173a38e5e11846418691275 (diff) | |
| download | kernel_samsung_smdk4412-40ce76dd060fd92f6f13398fd63c0df8dfd16d0a.zip kernel_samsung_smdk4412-40ce76dd060fd92f6f13398fd63c0df8dfd16d0a.tar.gz kernel_samsung_smdk4412-40ce76dd060fd92f6f13398fd63c0df8dfd16d0a.tar.bz2 | |
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>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 556858c..6c009c2 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2007,8 +2007,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; } |