From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
To: linux-xfs@vger.kernel.org
Cc: christian.brauner@ubuntu.com, hch@lst.de, djwong@kernel.org
Subject: [PATCH] xfs: do not clear S_ISUID|S_ISGID for idmapped mounts
Date: Mon, 21 Feb 2022 21:22:18 +0300 [thread overview]
Message-ID: <20220221182218.748084-1-andrey.zhadchenko@virtuozzo.com> (raw)
xfs_fileattr_set() handles idmapped mounts correctly and do not drop this
bits.
Unfortunately chown syscall results in different callstask:
i_op->xfs_vn_setattr()->...->xfs_setattr_nonsize() which checks if process
has CAP_FSETID capable in init_user_ns rather than mntns userns.
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
fs/xfs/xfs_iops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 09211e1d08ad..5b1fe635d153 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -774,7 +774,7 @@ xfs_setattr_nonsize(
* cleared upon successful return from chown()
*/
if ((inode->i_mode & (S_ISUID|S_ISGID)) &&
- !capable(CAP_FSETID))
+ !capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
inode->i_mode &= ~(S_ISUID|S_ISGID);
/*
--
2.35.0.rc2
next reply other threads:[~2022-02-21 18:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 18:22 Andrey Zhadchenko [this message]
2022-02-22 8:33 ` [PATCH] xfs: do not clear S_ISUID|S_ISGID for idmapped mounts Christoph Hellwig
2022-02-22 9:25 ` Andrey Zhadchenko
2022-02-22 10:24 ` Christian Brauner
2022-02-22 11:19 ` Andrey Zhadchenko
2022-02-22 12:23 ` Christian Brauner
2022-02-22 12:36 ` Christian Brauner
2022-02-22 12:44 ` Christian Brauner
2022-02-22 14:54 ` Andrey Zhadchenko
2022-02-22 15:03 ` Christian Brauner
2022-02-22 21:40 ` Dave Chinner
2022-02-23 8:11 ` Christian Brauner
2022-02-25 1:57 ` Darrick J. Wong
2022-02-25 9:45 ` Christian Brauner
2022-02-25 10:42 ` Andrey Zhadchenko
2022-02-25 17:11 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220221182218.748084-1-andrey.zhadchenko@virtuozzo.com \
--to=andrey.zhadchenko@virtuozzo.com \
--cc=christian.brauner@ubuntu.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).