From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
To: xiubli@redhat.com
Cc: brauner@kernel.org, stgraber@ubuntu.com,
linux-fsdevel@vger.kernel.org,
Christian Brauner <christian.brauner@ubuntu.com>,
Jeff Layton <jlayton@kernel.org>,
Ilya Dryomov <idryomov@gmail.com>,
ceph-devel@vger.kernel.org,
Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 11/14] ceph: allow idmapped setattr inode op
Date: Wed, 7 Jun 2023 20:09:54 +0200 [thread overview]
Message-ID: <20230607180958.645115-12-aleksandr.mikhalitsyn@canonical.com> (raw)
In-Reply-To: <20230607180958.645115-1-aleksandr.mikhalitsyn@canonical.com>
From: Christian Brauner <christian.brauner@ubuntu.com>
Enable __ceph_setattr() to handle idmapped mounts. This is just a matter
of passing down the mount's idmapping.
Cc: Xiubo Li <xiubli@redhat.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: ceph-devel@vger.kernel.org
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
[ adapted to b27c82e12965 ("attr: port attribute changes to new types") ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
v4:
- introduced fsuid/fsgid local variables
v3:
- reworked as Christian suggested here:
https://lore.kernel.org/lkml/20230602-vorzeichen-praktikum-f17931692301@brauner/
---
fs/ceph/inode.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index bcd9b506ec3b..ca438d1353b2 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -2052,31 +2052,35 @@ int __ceph_setattr(struct mnt_idmap *idmap, struct inode *inode,
dout("setattr %p issued %s\n", inode, ceph_cap_string(issued));
if (ia_valid & ATTR_UID) {
+ kuid_t fsuid = from_vfsuid(idmap, i_user_ns(inode), attr->ia_vfsuid);
+
dout("setattr %p uid %d -> %d\n", inode,
from_kuid(&init_user_ns, inode->i_uid),
from_kuid(&init_user_ns, attr->ia_uid));
if (issued & CEPH_CAP_AUTH_EXCL) {
- inode->i_uid = attr->ia_uid;
+ inode->i_uid = fsuid;
dirtied |= CEPH_CAP_AUTH_EXCL;
} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
- !uid_eq(attr->ia_uid, inode->i_uid)) {
+ !uid_eq(fsuid, inode->i_uid)) {
req->r_args.setattr.uid = cpu_to_le32(
- from_kuid(&init_user_ns, attr->ia_uid));
+ from_kuid(&init_user_ns, fsuid));
mask |= CEPH_SETATTR_UID;
release |= CEPH_CAP_AUTH_SHARED;
}
}
if (ia_valid & ATTR_GID) {
+ kgid_t fsgid = from_vfsgid(idmap, i_user_ns(inode), attr->ia_vfsgid);
+
dout("setattr %p gid %d -> %d\n", inode,
from_kgid(&init_user_ns, inode->i_gid),
from_kgid(&init_user_ns, attr->ia_gid));
if (issued & CEPH_CAP_AUTH_EXCL) {
- inode->i_gid = attr->ia_gid;
+ inode->i_gid = fsgid;
dirtied |= CEPH_CAP_AUTH_EXCL;
} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
- !gid_eq(attr->ia_gid, inode->i_gid)) {
+ !gid_eq(fsgid, inode->i_gid)) {
req->r_args.setattr.gid = cpu_to_le32(
- from_kgid(&init_user_ns, attr->ia_gid));
+ from_kgid(&init_user_ns, fsgid));
mask |= CEPH_SETATTR_GID;
release |= CEPH_CAP_AUTH_SHARED;
}
@@ -2241,7 +2245,7 @@ int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
if (ceph_inode_is_shutdown(inode))
return -ESTALE;
- err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
+ err = setattr_prepare(idmap, dentry, attr);
if (err != 0)
return err;
@@ -2256,7 +2260,7 @@ int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
err = __ceph_setattr(idmap, inode, attr);
if (err >= 0 && (attr->ia_valid & ATTR_MODE))
- err = posix_acl_chmod(&nop_mnt_idmap, dentry, attr->ia_mode);
+ err = posix_acl_chmod(idmap, dentry, attr->ia_mode);
return err;
}
--
2.34.1
next prev parent reply other threads:[~2023-06-07 18:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 18:09 [PATCH v4 00/14] ceph: support idmapped mounts Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 01/14] fs: export mnt_idmap_get/mnt_idmap_put Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 02/14] ceph: stash idmapping in mdsc request Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 03/14] ceph: handle idmapped mounts in create_request_message() Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 04/14] ceph: allow idmapped mknod inode op Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 05/14] ceph: allow idmapped symlink " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 06/14] ceph: allow idmapped mkdir " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 07/14] ceph: allow idmapped rename " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 08/14] ceph: allow idmapped getattr " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 09/14] ceph: allow idmapped permission " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 10/14] ceph: pass idmap to __ceph_setattr Alexander Mikhalitsyn
2023-06-07 18:09 ` Alexander Mikhalitsyn [this message]
2023-06-08 2:49 ` [PATCH v4 11/14] ceph: allow idmapped setattr inode op Xiubo Li
2023-06-08 15:46 ` Aleksandr Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 12/14] ceph/acl: allow idmapped set_acl " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 13/14] ceph/file: allow idmapped atomic_open " Alexander Mikhalitsyn
2023-06-07 18:09 ` [PATCH v4 14/14] ceph: allow idmapped mounts Alexander Mikhalitsyn
2023-06-08 3:00 ` [PATCH v4 00/14] ceph: support " Xiubo Li
2023-06-08 7:20 ` Aleksandr Mikhalitsyn
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=20230607180958.645115-12-aleksandr.mikhalitsyn@canonical.com \
--to=aleksandr.mikhalitsyn@canonical.com \
--cc=brauner@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=christian.brauner@ubuntu.com \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stgraber@ubuntu.com \
--cc=xiubli@redhat.com \
/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).