]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
fscrypt: use the mount idmap for the owner check in fscrypt_ioctl_set_policy()
authorZhan Xusheng <zhanxusheng@xiaomi.com>
Sat, 25 Jul 2026 08:00:04 +0000 (16:00 +0800)
committerEric Biggers <ebiggers@kernel.org>
Wed, 29 Jul 2026 04:19:44 +0000 (21:19 -0700)
fscrypt_ioctl_set_policy() calls inode_owner_or_capable() with
&nop_mnt_idmap before allowing an encryption policy to be set, instead
of the idmap of the mount the ioctl was issued on.

fscrypt is used by filesystems that support idmapped mounts (e.g. ext4,
f2fs), 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.  Use file_mnt_idmap(filp) instead.

Fixes: 14f3db5542e6 ("ext4: support idmapped mounts")
Cc: stable@vger.kernel.org
Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
Link: https://patch.msgid.link/20260725080004.929328-1-zhanxusheng1024@gmail.com
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
fs/crypto/policy.c

index 9915e39362dbabd78d279d1ae7875c01e9a8c4c9..c80b24a941ad05c54c55ae8adccb1ddc95c1d650 100644 (file)
@@ -534,7 +534,7 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg)
                return -EFAULT;
        policy.version = version;
 
-       if (!inode_owner_or_capable(&nop_mnt_idmap, inode))
+       if (!inode_owner_or_capable(file_mnt_idmap(filp), inode))
                return -EACCES;
 
        ret = mnt_want_write_file(filp);