lkml.org 
[lkml]   [2015]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 093/124] fs: Fix S_NOSEC handling
    Date
    From: Jan Kara <jack@suse.cz>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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>
    ---
    fs/inode.c | 4 ++--
    1 file 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;
    }
    --
    2.4.6


    \
     
     \ /
      Last update: 2015-07-28 12:01    [W:3.354 / U:0.896 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site