]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
f2fs: avoid selinux denial on CAP_SYS_RESOURCE
authorJaegeuk Kim <jaegeuk@kernel.org>
Fri, 9 Mar 2018 04:47:33 +0000 (20:47 -0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Sat, 17 Mar 2018 04:55:43 +0000 (13:55 +0900)
This fixes CAP_SYS_RESOURCE denial of selinux when using resgid, since it
seems selinux reports it at the first place, but mostly we don't need to
check this condition first.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/f2fs.h

index f6dc70666ebb2c401a54a8db6d35d53f444d6f03..3d12277fbe9e55614fda5ac144593c9d09e2ca82 100644 (file)
@@ -1607,13 +1607,13 @@ static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi,
                return false;
        if (IS_NOQUOTA(inode))
                return true;
-       if (capable(CAP_SYS_RESOURCE))
-               return true;
        if (uid_eq(sbi->s_resuid, current_fsuid()))
                return true;
        if (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) &&
                                        in_group_p(sbi->s_resgid))
                return true;
+       if (capable(CAP_SYS_RESOURCE))
+               return true;
        return false;
 }