ceph: use the mount idmap for the owner checks in the SET_LAYOUT ioctls
Subsystems (2)
PATCH 1/1 ceph: use the mount idmap for the owner checks in the SET_LAYOUT ioctls
From: Zhan Xusheng <[email protected]>
ceph_ioctl_set_layout() and ceph_ioctl_set_layout_policy() call inode_owner_or_capable() with &nop_mnt_idmap instead of the idmap of the mount the ioctl was issued on.
CephFS supports idmapped mounts (FS_ALLOW_IDMAP), so on such a mount this compares the caller's fsuid against the unmapped on-disk owner rather than the mapped owner: the actual owner can be wrongly denied with -EACCES and an unrelated caller wrongly allowed. Both functions already have the struct file, so use file_mnt_idmap(file) instead.
--- fs/ceph/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ceph/ioctl.c +2 -2
@@ -72,7 +72,7 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)struct ceph_ioctl_layout nl;int err; -if (!inode_owner_or_capable (&nop_mnt_idmap, inode)) +if (!inode_owner_or_capable (file_mnt_idmap (file), inode))return -EACCES ;if (copy_from_user (&l, arg,sizeof (l)))
@@ -145,7 +145,7 @@ static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg)int err;struct ceph_mds_client *mdsc =ceph_sb_to_fs_client (inode->i_sb)->mdsc; -if (!inode_owner_or_capable (&nop_mnt_idmap, inode)) +if (!inode_owner_or_capable (file_mnt_idmap (file), inode))return -EACCES ;/* copy and validate */
Signature · 1 line
2.43.0
Ilya Dryomov
maintainerQuoted 34 lines · Zhan Xusheng
From: Zhan Xusheng <[email protected]>
ceph_ioctl_set_layout()andceph_ioctl_set_layout_policy()callinode_owner_or_capable()with&nop_mnt_idmapinstead of the idmap of the mount the ioctl was issued on.CephFS supports idmapped mounts (
FS_ALLOW_IDMAP), so on such a mount this compares the caller's fsuid against the unmapped on-disk owner rather than the mapped owner: the actual owner can be wrongly denied with-EACCESand an unrelated caller wrongly allowed. Both functions already have the struct file, so usefile_mnt_idmap(file)instead.Fixes cee38bbf5556 ("ceph: add owner/capability checks for CEPH_IOC_SET_LAYOUT*")Signed-off-by Zhan Xusheng <[email protected]>--- fs/ceph/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/ceph/ioctl.c +1
-1@@ -72,7 +72,7 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)struct ceph_ioctl_layout nl;int err; -if (!inode_owner_or_capable (&nop_mnt_idmap, inode)) +if (!inode_owner_or_capable (file_mnt_idmap (file), inode))return -EACCES ;if (copy_from_user (&l, arg,sizeof (l)))
fs/ceph/ioctl.c static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg) · line 148
Quoted 5 lines
fs/ceph/ioctl.c +1
-1@@ -145,7 +145,7 @@ static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg)int err;struct ceph_mds_client *mdsc =ceph_sb_to_fs_client (inode->i_sb)->mdsc; -if (!inode_owner_or_capable (&nop_mnt_idmap, inode)) +if (!inode_owner_or_capable (file_mnt_idmap (file), inode))
Hi Max,
Was there any specific reason you used nop_mnt_idmap for these checks?
Thanks,
Ilya
Quoted 1 line · Ilya Dryomov
Was there any specific reason you used
nop_mnt_idmapfor these checks?
No, I copied that check from another filesystem, probably ext2. I had no idea what this parameter means (and I have never used idmappings). I guess the amended parameter in this patch is correct.
Signature · 8 lines
Max Kellermann Principal Architect Hosting Technology cm4all | Im Mediapark 6a | 50670 Köln | Germany General information about the company can be found here: https://www.cm4all.com/impressum A member of the IONOS Group
Ilya Dryomov
maintainerQuoted 7 lines · Max Kellermann
Quoted 1 line · Ilya Dryomov
Was there any specific reason you used
nop_mnt_idmapfor these checks?No, I copied that check from another filesystem, probably ext2. I had no idea what this parameter means (and I have never used idmappings). I guess the amended parameter in this patch is correct.
Hi Xiubo,
You reviewed Max's "ceph: add owner/capability checks for CEPH_IOC_SET_LAYOUT*" patch. Would you be able to review this fixup as well?
Thanks,
Ilya
Xiubo Li
Reviewed-byHi Ilya,
I'm not sure why I couldn't find the original email of this. I checked the changes on lore.kernel.org.
The fix looks correct to me.
On an idmapped mount, using &nop_mnt_idmap compares the caller's fsuid against the unmapped on-disk uid directly, which would wrongly deny the actual mapped owner and potentially allow an unrelated caller. Both functions already have the struct file, so switching to file_mnt_idmap(file) is the right thing to do.
Thanks
Xiubo Li
Quoted 19 lines · Ilya Dryomov
Quoted 7 lines · Max Kellermann
Quoted 1 line · Ilya Dryomov
Was there any specific reason you used
nop_mnt_idmapfor these checks?No, I copied that check from another filesystem, probably ext2. I had no idea what this parameter means (and I have never used idmappings). I guess the amended parameter in this patch is correct.
Hi Xiubo,
You reviewed Max's "ceph: add owner/capability checks for CEPH_IOC_SET_LAYOUT*" patch. Would you be able to review this fixup as well?
Thanks,
Ilya
Quoted 8 lines · Xiubo Li
Hi Ilya,
I'm not sure why I couldn't find the original email of this. I checked the changes on lore.kernel.org.
The fix looks correct to me.
Quoted 7 lines
On an idmapped mount, using
&nop_mnt_idmapcompares the caller's fsuid against the unmapped on-disk uid directly, which would wrongly deny the actual mapped owner and potentially allow an unrelated caller. Both functions already have the struct file, so switching tofile_mnt_idmap(file)is the right thing to do.Reviewed-by Xiubo Li <[email protected]>
Applied.
Thanks,
Ilya
Quoted 24 lines
Thanks
Xiubo LiQuoted 19 lines · Ilya Dryomov
Quoted 7 lines · Max Kellermann
Quoted 1 line · Ilya Dryomov
Was there any specific reason you used
nop_mnt_idmapfor these checks?No, I copied that check from another filesystem, probably ext2. I had no idea what this parameter means (and I have never used idmappings). I guess the amended parameter in this patch is correct.
Hi Xiubo,
You reviewed Max's "ceph: add owner/capability checks for CEPH_IOC_SET_LAYOUT*" patch. Would you be able to review this fixup as well?
Thanks,
Ilya
Hi Zhan Xusheng,
Good catch — the raw current_fsuid() check is indeed wrong on idmapped mounts. The fix looks correct.
--
Alex Markuze