moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fs: tweak fsuidgid_has_mapping()"

Browse Source 
This reverts commit 47ab4bf156.
This commit is contained in:
Jaegeuk Kim
2023-01-04 13:00:01 -08:00
parent ad8f8965ff
commit c8072d62cb
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/fs.h
View File

@@ -1697,18 +1697,10 @@ static inline void inode_fsgid_set(struct inode *inode,
static inline bool fsuidgid_has_mapping(struct super_block *sb, static inline bool fsuidgid_has_mapping(struct super_block *sb,
struct user_namespace *mnt_userns) struct user_namespace *mnt_userns)
{ {
struct user_namespace *fs_userns = sb->s_user_ns; struct user_namespace *s_user_ns = sb->s_user_ns;
kuid_t kuid;
kgid_t kgid;
kuid = mapped_fsuid(mnt_userns); return kuid_has_mapping(s_user_ns, mapped_fsuid(mnt_userns)) &&
if (!uid_valid(kuid)) kgid_has_mapping(s_user_ns, mapped_fsgid(mnt_userns));
return false;
kgid = mapped_fsgid(mnt_userns);
if (!gid_valid(kgid))
return false;
return kuid_has_mapping(fs_userns, kuid) &&
kgid_has_mapping(fs_userns, kgid);
} }
extern struct timespec64 current_time(struct inode *inode); extern struct timespec64 current_time(struct inode *inode);