Skip to content

Commit fea6d2a

Browse files
rhvgoyalebiederm
authored andcommitted
vfs: Use upper filesystem inode in bprm_fill_uid()
Right now bprm_fill_uid() uses inode fetched from file_inode(bprm->file). This in turn returns inode of lower filesystem (in a stacked filesystem setup). I was playing with modified patches of shiftfs posted by james bottomley and realized that through shiftfs setuid bit does not take effect. And reason being that we fetch uid/gid from inode of lower fs (and not from shiftfs inode). And that results in following checks failing. /* We ignore suid/sgid if there are no mappings for them in the ns */ if (!kuid_has_mapping(bprm->cred->user_ns, uid) || !kgid_has_mapping(bprm->cred->user_ns, gid)) return; uid/gid fetched from lower fs inode might not be mapped inside the user namespace of container. So we need to look at uid/gid fetched from upper filesystem (shiftfs in this particular case) and these should be mapped and setuid bit can take affect. Signed-off-by: Vivek Goyal <[email protected]> Signed-off-by: Eric W. Biederman <[email protected]>
1 parent d6cffbb commit fea6d2a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ static void bprm_fill_uid(struct linux_binprm *bprm)
14751475
if (task_no_new_privs(current))
14761476
return;
14771477

1478-
inode = file_inode(bprm->file);
1478+
inode = bprm->file->f_path.dentry->d_inode;
14791479
mode = READ_ONCE(inode->i_mode);
14801480
if (!(mode & (S_ISUID|S_ISGID)))
14811481
return;

0 commit comments

Comments
 (0)