lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 019/717] selinux: fix error initialization in inode_doinit_with_dentry()
    Date
    From: Tianyue Ren <rentianyue@kylinos.cn>

    [ Upstream commit 83370b31a915493231e5b9addc72e4bef69f8d31 ]

    Mark the inode security label as invalid if we cannot find
    a dentry so that we will retry later rather than marking it
    initialized with the unlabeled SID.

    Fixes: 9287aed2ad1f ("selinux: Convert isec->lock into a spinlock")
    Signed-off-by: Tianyue Ren <rentianyue@kylinos.cn>
    [PM: minor comment tweaks]
    Signed-off-by: Paul Moore <paul@paul-moore.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    security/selinux/hooks.c | 19 ++++++++++++++++---
    1 file changed, 16 insertions(+), 3 deletions(-)

    diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
    index 6b1826fc3658e..158fc47d8620d 100644
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -1451,7 +1451,13 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
    * inode_doinit with a dentry, before these inodes could
    * be used again by userspace.
    */
    - goto out;
    + isec->initialized = LABEL_INVALID;
    + /*
    + * There is nothing useful to jump to the "out"
    + * label, except a needless spin lock/unlock
    + * cycle.
    + */
    + return 0;
    }

    rc = inode_doinit_use_xattr(inode, dentry, sbsec->def_sid,
    @@ -1507,8 +1513,15 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
    * inode_doinit() with a dentry, before these inodes
    * could be used again by userspace.
    */
    - if (!dentry)
    - goto out;
    + if (!dentry) {
    + isec->initialized = LABEL_INVALID;
    + /*
    + * There is nothing useful to jump to the "out"
    + * label, except a needless spin lock/unlock
    + * cycle.
    + */
    + return 0;
    + }
    rc = selinux_genfs_get_sid(dentry, sclass,
    sbsec->flags, &sid);
    if (rc) {
    --
    2.27.0


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