fs: improve setgid stripping consistency even more
Subsystems (4)
Christian Brauner
maintainercover fs: improve setgid stripping consistency even more
From: "Christian Brauner (Microsoft)" <[email protected]>
Hey everyone,
A long while ago I found a few setgid inheritance bugs in overlayfs in certain conditions. Amir recently picked this back up in
https://lore.kernel.org/linux-fsdevel/[email protected]
and I jumped on board to fix this more generally. This series should make setgid stripping more consistent and fix the related overlayfs bugs.
Currently setgid stripping in file_remove_privs()'s should_remove_suid() helper is inconsistent with other parts of the vfs. Specifically, it only raises ATTR_KILL_SGID if the inode is S_ISGID and S_IXGRP but not if the inode isn't in the caller's groups and the caller isn't privileged over the inode although we require this already in setattr_prepare() and setattr_copy() and so all filesystem implement this requirement implicitly because they have to use setattr_{prepare,copy}() anyway.
But the inconsistency shows up in setgid stripping bugs for overlayfs in xfstests. For example, we test whether suid and setgid stripping works correctly when performing various write-like operations as an unprivileged user (fallocate, reflink, write, etc.):
echo "Test 1 - qa_user, non-exec file $verb"setup_testfile
chmod a+rws $junk_filecommit_and_check "$qa_user" "$verb" 64k 64k
The test basically creates a file with 6666 permissions. While the file has the S_ISUID and S_ISGID bits set it does not have the S_IXGRP set. On a regular filesystem like xfs what will happen is:
sys_fallocate()
-> vfs_fallocate()
-> xfs_file_fallocate()
-> file_modified()
-> __file_remove_privs()
-> dentry_needs_remove_privs()
-> should_remove_suid()
-> __remove_privs()
newattrs.ia_valid = ATTR_FORCE | kill;
-> notify_change()
-> setattr_copy()In should_remove_suid() we can see that ATTR_KILL_SUID is raised unconditionally because the file in the test has S_ISUID set.
But we also see that ATTR_KILL_SGID won't be set because while the file is S_ISGID it is not S_IXGRP (see above) which is a condition for ATTR_KILL_SGID being raised.
So by the time we call notify_change() we have attr->ia_valid set to ATTR_KILL_SUID | ATTR_FORCE. Now notify_change() sees that ATTR_KILL_SUID is set and does:
ia_valid = attr->ia_valid |= ATTR_MODEattr->ia_mode = (inode->i_mode & ~S_ISUID);
which means that when we call setattr_copy() later we will definitely update inode->i_mode. Note that attr->ia_mode still contains S_ISGID.
Now we call into the filesystem's ->setattr() inode operation which will end up calling setattr_copy(). Since ATTR_MODE is set we will hit:
if (ia_valid & ATTR_MODE) {
umode_t mode = attr->ia_mode;
vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode);
if (!vfsgid_in_group_p(vfsgid) &&
!capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
mode &= ~S_ISGID;
inode->i_mode = mode;
}and since the caller in the test is neither capable nor in the group of the inode the S_ISGID bit is stripped.
But assume the file isn't suid then ATTR_KILL_SUID won't be raised which has the consequence that neither the setgid nor the suid bits are stripped even though it should be stripped because the inode isn't in the caller's groups and the caller isn't privileged over the inode.
If overlayfs is in the mix things become a bit more complicated and the bug shows up more clearly. When e.g., ovl_setattr() is hit from ovl_fallocate()'s call to file_remove_privs() then ATTR_KILL_SUID and ATTR_KILL_SGID might be raised but because the check in notify_change() is questioning the ATTR_KILL_SGID flag again by requiring S_IXGRP for it to be stripped the S_ISGID bit isn't removed even though it should be stripped:
sys_fallocate()
-> vfs_fallocate()
-> ovl_fallocate()
-> file_remove_privs()
-> dentry_needs_remove_privs()
-> should_remove_suid()
-> __remove_privs()
newattrs.ia_valid = ATTR_FORCE | kill;
-> notify_change()
-> ovl_setattr()
// TAKE ON MOUNTER'S CREDS
-> ovl_do_notify_change()
-> notify_change()
// GIVE UP MOUNTER'S CREDS
// TAKE ON MOUNTER'S CREDS
-> vfs_fallocate()
-> xfs_file_fallocate()
-> file_modified()
-> __file_remove_privs()
-> dentry_needs_remove_privs()
-> should_remove_suid()
-> __remove_privs()
newattrs.ia_valid = attr_force | kill;
-> notify_change()The fix for all of this is to make file_remove_privs()'s should_remove_suid() helper to perform the same checks as we already require in setattr_prepare() and setattr_copy() and have notify_change() not pointlessly requiring S_IXGRP again. It doesn't make any sense in the first place because the caller must calculate the flags via should_remove_suid() anyway which would raise ATTR_KILL_SGID.
Thanks!
Christian
Amir Goldstein (2):
ovl: remove privs in ovl_copyfile()
ovl: remove privs in ovl_fallocate()
Christian Brauner (1):
attr: use consistent sgid stripping checks
fs/attr.c | 4 +++- fs/fuse/file.c | 2 +- fs/inode.c | 47 +++++++++++++++++++++++++++++++-------------- fs/internal.h | 3 ++- fs/ocfs2/file.c | 4 ++-- fs/open.c | 2 +- fs/overlayfs/file.c | 28 ++++++++++++++++++++++++--- include/linux/fs.h | 2 +- 8 files changed, 68 insertions(+), 24 deletions(-)
Signature · 1 line
2.34.1
Christian Brauner
maintainerPATCH 1/3 attr: use consistent sgid stripping checks
Currently setgid stripping in file_remove_privs()'s should_remove_suid() helper is inconsistent with other parts of the vfs. Specifically, it only raises ATTR_KILL_SGID if the inode is S_ISGID and S_IXGRP but not if the inode isn't in the caller's groups and the caller isn't privileged over the inode although we require this already in setattr_prepare() and setattr_copy() and so all filesystem implement this requirement implicitly because they have to use setattr_{prepare,copy}() anyway.
But the inconsistency shows up in setgid stripping bugs for overlayfs in xfstests. For example, we test whether suid and setgid stripping works correctly when performing various write-like operations as an unprivileged user (fallocate, reflink, write, etc.):
echo "Test 1 - qa_user, non-exec file $verb"setup_testfile
chmod a+rws $junk_filecommit_and_check "$qa_user" "$verb" 64k 64k
The test basically creates a file with 6666 permissions. While the file has the S_ISUID and S_ISGID bits set it does not have the S_IXGRP set. On a regular filesystem like xfs what will happen is:
sys_fallocate()
-> vfs_fallocate()
-> xfs_file_fallocate()
-> file_modified()
-> __file_remove_privs()
-> dentry_needs_remove_privs()
-> should_remove_suid()
-> __remove_privs()
newattrs.ia_valid = ATTR_FORCE | kill;
-> notify_change()
-> setattr_copy()In should_remove_suid() we can see that ATTR_KILL_SUID is raised unconditionally because the file in the test has S_ISUID set.
But we also see that ATTR_KILL_SGID won't be set because while the file is S_ISGID it is not S_IXGRP (see above) which is a condition for ATTR_KILL_SGID being raised.
So by the time we call notify_change() we have attr->ia_valid set to ATTR_KILL_SUID | ATTR_FORCE. Now notify_change() sees that ATTR_KILL_SUID is set and does:
ia_valid = attr->ia_valid |= ATTR_MODEattr->ia_mode = (inode->i_mode & ~S_ISUID);
which means that when we call setattr_copy() later we will definitely update inode->i_mode. Note that attr->ia_mode still contains S_ISGID.
Now we call into the filesystem's ->setattr() inode operation which will end up calling setattr_copy(). Since ATTR_MODE is set we will hit:
if (ia_valid & ATTR_MODE) {
umode_t mode = attr->ia_mode;
vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode);
if (!vfsgid_in_group_p(vfsgid) &&
!capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
mode &= ~S_ISGID;
inode->i_mode = mode;
}and since the caller in the test is neither capable nor in the group of the inode the S_ISGID bit is stripped.
But assume the file isn't suid then ATTR_KILL_SUID won't be raised which has the consequence that neither the setgid nor the suid bits are stripped even though it should be stripped because the inode isn't in the caller's groups and the caller isn't privileged over the inode.
If overlayfs is in the mix things become a bit more complicated and the bug shows up more clearly. When e.g., ovl_setattr() is hit from ovl_fallocate()'s call to file_remove_privs() then ATTR_KILL_SUID and ATTR_KILL_SGID might be raised but because the check in notify_change() is questioning the ATTR_KILL_SGID flag again by requiring S_IXGRP for it to be stripped the S_ISGID bit isn't removed even though it should be stripped:
sys_fallocate()
-> vfs_fallocate()
-> ovl_fallocate()
-> file_remove_privs()
-> dentry_needs_remove_privs()
-> should_remove_suid()
-> __remove_privs()
newattrs.ia_valid = ATTR_FORCE | kill;
-> notify_change()
-> ovl_setattr()
// TAKE ON MOUNTER'S CREDS
-> ovl_do_notify_change()
-> notify_change()
// GIVE UP MOUNTER'S CREDS
// TAKE ON MOUNTER'S CREDS
-> vfs_fallocate()
-> xfs_file_fallocate()
-> file_modified()
-> __file_remove_privs()
-> dentry_needs_remove_privs()
-> should_remove_suid()
-> __remove_privs()
newattrs.ia_valid = attr_force | kill;
-> notify_change()The fix for all of this is to make file_remove_privs()'s should_remove_suid() helper to perform the same checks as we already require in setattr_prepare() and setattr_copy() and have notify_change() not pointlessly requiring S_IXGRP again. It doesn't make any sense in the first place because the caller must calculate the flags via should_remove_suid() anyway which would raise ATTR_KILL_SGID.
Running xfstests with this doesn't report any regressions. We should really try and use consistent checks.
--- fs/attr.c | 4 +++- fs/fuse/file.c | 2 +- fs/inode.c | 47 ++++++++++++++++++++++++++++++++-------------- fs/internal.h | 3 ++- fs/ocfs2/file.c | 4 ++-- fs/open.c | 2 +- include/linux/fs.h | 2 +- 7 files changed, 43 insertions(+), 21 deletions(-)
fs/attr.c +3 -1
@@ -18,6 +18,8 @@#include <linux/evm.h> #include <linux/ima.h> +#include "internal.h" +/** * chown_ok - verify permissions to chown inode * @mnt_userns: user namespace of the mount @inode was found from
@@ -375,7 +377,7 @@ int notify_change(struct user_namespace *mnt_userns, struct dentry *dentry, } }if (ia_valid &ATTR_KILL_SGID ) { -if ((mode & (S_ISGID |S_IXGRP )) == (S_ISGID |S_IXGRP )) { +if (mode &S_ISGID ) {if (!(ia_valid &ATTR_MODE )) { ia_valid = attr->ia_valid |=ATTR_MODE ; attr->ia_mode = inode->i_mode;
fs/fuse/file.c +1 -1
@@ -1313,7 +1313,7 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)return err;if (fc->handle_killpriv_v2 && -should_remove_suid (file_dentry (file))) { +should_remove_suid (&init_user_ns,file_dentry (file))) { goto writethrough; }
fs/inode.c +33 -14
80 lines not on this page · raw message
fs/internal.h +2 -1
@@ -139,7 +139,8 @@ extern int vfs_open(const struct path *, struct file *);* inode.c */ extern long prune_icache_sb (struct super_block *sb,struct shrink_control *sc); -extern int dentry_needs_remove_privs (struct dentry *dentry); +extern int dentry_needs_remove_privs (struct user_namespace *, +struct dentry *dentry);/* * fs-writeback.c
fs/ocfs2/file.c +2 -2
@@ -1991,7 +1991,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode, } } -if (file &&should_remove_suid (file->f_path.dentry)) { +if (file &&should_remove_suid (&init_user_ns, file->f_path.dentry)) { ret =__ocfs2_write_remove_suid (inode, di_bh);if (ret) {mlog_errno (ret);
@@ -2279,7 +2279,7 @@ static int ocfs2_prepare_inode_for_write(struct file *file,* inode. There's also the dinode i_size state which * can be lost via setattr during extending writes (we * set inode->i_size at the end of a write. */ -if (should_remove_suid (dentry)) { +if (should_remove_suid (&init_user_ns, dentry)) {if (meta_level ==0 ) { ocfs2_inode_unlock_for_extent_tree(inode, &di_bh,
fs/open.c +1 -1
@@ -54,7 +54,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry, }/* Remove suid, sgid, and file capabilities on truncate too */ - ret =dentry_needs_remove_privs (dentry); + ret =dentry_needs_remove_privs (mnt_userns, dentry);if (ret <0 )return ret;if (ret)
include/linux/fs.h +1 -1
@@ -3090,7 +3090,7 @@ extern void __destroy_inode(struct inode *);extern struct inode *new_inode_pseudo (struct super_block *sb);extern struct inode *new_inode (struct super_block *sb);extern void free_inode_nonrcu (struct inode *inode); -extern int should_remove_suid (struct dentry *); +extern int should_remove_suid (struct user_namespace *,struct dentry *);extern int file_remove_privs (struct file *);/*
Signature · 1 line
2.34.1
Amir Goldstein
maintainerRe: [PATCH 1/3] attr: use consistent sgid stripping checks
Quoted 9 lines · Christian Brauner
Currently setgid stripping in file_remove_privs()'s
should_remove_suid()helper is inconsistent with other parts of the vfs. Specifically, it only raisesATTR_KILL_SGIDif the inode isS_ISGIDandS_IXGRPbut not if the inode isn't in the caller's groups and the caller isn't privileged over the inode although we require this already insetattr_prepare()andsetattr_copy()and so all filesystem implement this requirement implicitly because they have to use setattr_{prepare,copy}() anyway.
Quoted 4 lines
But the inconsistency shows up in setgid stripping bugs for overlayfs in xfstests. For example, we test whether suid and setgid stripping works correctly when performing various write-like operations as an unprivileged user (fallocate, reflink, write, etc.):
Maybe spell out the failing fstests numbers?
Quoted 118 lines
echo "Test 1 -
qa_user, non-exec file $verb"setup_testfile
chmod a+rws $junk_filecommit_and_check"$qa_user" "$verb" 64k 64kThe test basically creates a file with 6666 permissions. While the file has the
S_ISUIDandS_ISGIDbits set it does not have theS_IXGRPset. On a regular filesystem like xfs what will happen is:
sys_fallocate()
->vfs_fallocate()
->xfs_file_fallocate()-> file_modified() -> __file_remove_privs() -> dentry_needs_remove_privs() -> should_remove_suid() -> __remove_privs() newattrs.ia_valid = ATTR_FORCE | kill; -> notify_change() -> setattr_copy()In
should_remove_suid()we can see thatATTR_KILL_SUIDis raised unconditionally because the file in the test hasS_ISUIDset.But we also see that
ATTR_KILL_SGIDwon't be set because while the file isS_ISGIDit is notS_IXGRP(see above) which is a condition forATTR_KILL_SGIDbeing raised.So by the time we call
notify_change()we haveattr->ia_validset toATTR_KILL_SUID|ATTR_FORCE. Nownotify_change()sees thatATTR_KILL_SUIDis set and does:
ia_valid=attr->ia_valid|=ATTR_MODEattr->ia_mode= (inode->i_mode& ~S_ISUID);which means that when we call
setattr_copy()later we will definitely updateinode->i_mode. Note thatattr->ia_modestill containsS_ISGID.Now we call into the filesystem's ->setattr() inode operation which will end up calling
setattr_copy(). SinceATTR_MODEis set we will hit:if (ia_valid & ATTR_MODE) { umode_t mode = attr->ia_mode; vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode); if (!vfsgid_in_group_p(vfsgid) && !capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID)) mode &= ~S_ISGID; inode->i_mode = mode; }and since the caller in the test is neither capable nor in the group of the inode the
S_ISGIDbit is stripped.But assume the file isn't suid then
ATTR_KILL_SUIDwon't be raised which has the consequence that neither the setgid nor the suid bits are stripped even though it should be stripped because the inode isn't in the caller's groups and the caller isn't privileged over the inode.If overlayfs is in the mix things become a bit more complicated and the bug shows up more clearly. When e.g.,
ovl_setattr()is hit from ovl_fallocate()'s call tofile_remove_privs()thenATTR_KILL_SUIDandATTR_KILL_SGIDmight be raised but because the check innotify_change()is questioning theATTR_KILL_SGIDflag again by requiringS_IXGRPfor it to be stripped theS_ISGIDbit isn't removed even though it should be stripped:
sys_fallocate()
->vfs_fallocate()
->ovl_fallocate()-> file_remove_privs() -> dentry_needs_remove_privs() -> should_remove_suid() -> __remove_privs() newattrs.ia_valid = ATTR_FORCE | kill; -> notify_change() -> ovl_setattr() // TAKE ON MOUNTER'S CREDS -> ovl_do_notify_change() -> notify_change() // GIVE UP MOUNTER'S CREDS // TAKE ON MOUNTER'S CREDS -> vfs_fallocate() -> xfs_file_fallocate() -> file_modified() -> __file_remove_privs() -> dentry_needs_remove_privs() -> should_remove_suid() -> __remove_privs() newattrs.ia_valid = attr_force | kill; -> notify_change()The fix for all of this is to make file_remove_privs()'s
should_remove_suid()helper to perform the same checks as we already require insetattr_prepare()andsetattr_copy()and havenotify_change()not pointlessly requiringS_IXGRPagain. It doesn't make any sense in the first place because the caller must calculate the flags viashould_remove_suid()anyway which would raiseATTR_KILL_SGID.Running xfstests with this doesn't report any regressions. We should really try and use consistent checks.
Co-Developed-by Amir Goldstein <[email protected]>Signed-off-by Christian Brauner (Microsoft) <[email protected]>--- fs/attr.c | 4 +++- fs/fuse/file.c | 2 +- fs/inode.c | 47 ++++++++++++++++++++++++++++++++-------------- fs/internal.h | 3 ++- fs/ocfs2/file.c | 4 ++-- fs/open.c | 2 +- include/linux/fs.h | 2 +- 7 files changed, 43 insertions(+), 21 deletions(-)fs/attr.c +0
-0
fs/attr.c line 22
Quoted 5 lines
fs/attr.c +2
-0@@ -18,6 +18,8 @@#include <linux/evm.h> #include <linux/ima.h> +#include "internal.h" +
Leftover, not needed.
Thanks for the fast response :)
Amir.
Re: [PATCH 1/3] attr: use consistent sgid stripping checks
In reply to Christian BraunerQuoted 28 lines · Christian Brauner
fs/inode.c +13
-5@@ -1949,26 +1949,44 @@ void touch_atime(const struct path *path) }EXPORT_SYMBOL (touch_atime); -/* -* The logic we want is +/** +* should_remove_sgid - determine whether the setgid bit needs to be removed +* @mnt_userns: User namespace of the mount the inode was created from +* @inode: inode to check +* +* This function determines whether the setgid bit needs to be removed. +* We retain backwards compatibility where we require the setgid bit to be +* removed unconditionally if S_IXGRP is set. Otherwise we have the exact same +* requirements as setattr_prepare() and setattr_copy(). * -* if suid or (sgid and xgrp) -* remove privs +* Return: true if setgit bit needs to be removed, false otherwise. */ -int should_remove_suid (struct dentry *dentry) +static bool should_remove_sgid (struct user_namespace *mnt_userns, +struct inode *inode) +{
fs/inode.c void touch_atime(const struct path *path) · line 1976
Quoted 10 lines
fs/inode.c +10
-0+umode_t mode = inode->i_mode; + +if (unlikely (mode &S_ISGID )) { +if ((mode &S_IXGRP ) || + (!vfsgid_in_group_p (i_gid_into_vfsgid (mnt_userns, inode)) && + !capable_wrt_inode_uidgid (mnt_userns, inode,CAP_FSETID ))) +return true; + } + +return false;
I find this sort of convoluted logic much easier to follow when it's written as a stacked set of single comparisons like so:
if (!(mode & S_ISGID)) return false; if (mode & S_IXGRP) return true; if (vfsgid_in_group_p(i_gid_into_vfsgid(mnt_userns, inode)) return false; if (capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID) return false; return true;
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Christian Brauner
maintainerRe: [PATCH 1/3] attr: use consistent sgid stripping checks
Quoted 43 lines · Dave Chinner
Quoted 28 lines · Christian Brauner
fs/inode.c +13
-5@@ -1949,26 +1949,44 @@ void touch_atime(const struct path *path) }EXPORT_SYMBOL (touch_atime); -/* -* The logic we want is +/** +* should_remove_sgid - determine whether the setgid bit needs to be removed +* @mnt_userns: User namespace of the mount the inode was created from +* @inode: inode to check +* +* This function determines whether the setgid bit needs to be removed. +* We retain backwards compatibility where we require the setgid bit to be +* removed unconditionally if S_IXGRP is set. Otherwise we have the exact same +* requirements as setattr_prepare() and setattr_copy(). * -* if suid or (sgid and xgrp) -* remove privs +* Return: true if setgit bit needs to be removed, false otherwise. */ -int should_remove_suid (struct dentry *dentry) +static bool should_remove_sgid (struct user_namespace *mnt_userns, +struct inode *inode) +{fs/inode.c void touch_atime(const struct path *path) · line 1976
Quoted 10 lines
fs/inode.c +10
-0+umode_t mode = inode->i_mode; + +if (unlikely (mode &S_ISGID )) { +if ((mode &S_IXGRP ) || + (!vfsgid_in_group_p (i_gid_into_vfsgid (mnt_userns, inode)) && + !capable_wrt_inode_uidgid (mnt_userns, inode,CAP_FSETID ))) +return true; + } + +return false;I find this sort of convoluted logic much easier to follow when it's written as a stacked set of single comparisons like so:
Quoted 9 lines
if (!(mode & S_ISGID)) return false; if (mode & S_IXGRP) return true; if (vfsgid_in_group_p(i_gid_into_vfsgid(mnt_userns, inode)) return false; if (capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID) return false; return true;
Good idea, I'll fix that up in tree.
Thanks!
Christian
Miklos Szeredi
maintainerRe: [PATCH 1/3] attr: use consistent sgid stripping checks
In reply to Christian BraunerQuoted 8 lines · Christian Brauner
Currently setgid stripping in file_remove_privs()'s
should_remove_suid()helper is inconsistent with other parts of the vfs. Specifically, it only raisesATTR_KILL_SGIDif the inode isS_ISGIDandS_IXGRPbut not if the inode isn't in the caller's groups and the caller isn't privileged over the inode although we require this already insetattr_prepare()andsetattr_copy()and so all filesystem implement this requirement implicitly because they have to use setattr_{prepare,copy}() anyway.
Could the actual code (not just the logic) be shared between should_remove_sgid() and setattr_copy()?
Maybe add another helper, or reformulate should_remove_sgid() so that it can be used for both purposes.
Thanks,
Miklos
Christian Brauner
maintainerRe: [PATCH 1/3] attr: use consistent sgid stripping checks
Quoted 10 lines · Miklos Szeredi
Quoted 8 lines · Christian Brauner
Currently setgid stripping in file_remove_privs()'s
should_remove_suid()helper is inconsistent with other parts of the vfs. Specifically, it only raisesATTR_KILL_SGIDif the inode isS_ISGIDandS_IXGRPbut not if the inode isn't in the caller's groups and the caller isn't privileged over the inode although we require this already insetattr_prepare()andsetattr_copy()and so all filesystem implement this requirement implicitly because they have to use setattr_{prepare,copy}() anyway.
Quoted 5 lines
Could the actual code (not just the logic) be shared between
should_remove_sgid()andsetattr_copy()?Maybe add another helper, or reformulate
should_remove_sgid()so that it can be used for both purposes.
Yeah, thanks for pointing that out. I'm actually working on that.
Christian Brauner
maintainerPATCH 2/3 ovl: remove privs in ovl_copyfile()
In reply to Christian BraunerFrom: Amir Goldstein <[email protected]>
Underlying fs doesn't remove privs because copy_range/remap_range are called with privileged mounter credentials.
This fixes some failures in fstest generic/673.
--- fs/overlayfs/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
fs/overlayfs/file.c +14 -2
@@ -567,14 +567,23 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,const struct cred *old_cred;loff_t ret; +inode_lock (inode_out); +if (op !=OVL_DEDUPE ) { +/* Update mode */ +ovl_copyattr (inode_out); + ret =file_remove_privs (file_out); +if (ret) + goto out_unlock; + } + ret =ovl_real_fdget (file_out, &real_out);if (ret) -return ret; + goto out_unlock; ret =ovl_real_fdget (file_in, &real_in);if (ret) {fdput (real_out); -return ret; + goto out_unlock; } old_cred =ovl_override_creds (file_inode (file_out)->i_sb);
@@ -603,6 +612,9 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,fdput (real_in);fdput (real_out); +out_unlock: +inode_unlock (inode_out); +return ret; }
Signature · 1 line
2.34.1
Christian Brauner
maintainerPATCH 3/3 ovl: remove privs in ovl_fallocate()
In reply to Christian BraunerFrom: Amir Goldstein <[email protected]>
Underlying fs doesn't remove privs because fallocate is called with privileged mounter credentials.
This fixes some failure in fstests generic/683..687.
--- fs/overlayfs/file.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
fs/overlayfs/file.c +11 -1
@@ -517,9 +517,16 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenconst struct cred *old_cred;int ret; +inode_lock (inode); +/* Update mode */ +ovl_copyattr (inode); + ret =file_remove_privs (file); +if (ret) + goto out_unlock; + ret =ovl_real_fdget (file, &real);if (ret) -return ret; + goto out_unlock; old_cred =ovl_override_creds (file_inode (file)->i_sb); ret =vfs_fallocate (real.file, mode, offset, len);
@@ -530,6 +537,9 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenfdput (real); +out_unlock: +inode_unlock (inode); +return ret; }
Signature · 1 line
2.34.1