summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Forshee <sforshee@kernel.org>2023-03-09 21:39:09 +0100
committerChristian Brauner (Microsoft) <brauner@kernel.org>2023-03-09 22:36:12 +0100
commit42d0c4bdf753063b6eec55415003184d3ca24f6e (patch)
treeb8f797ca79f4b015cfc32421b75022386468e303
parentfs/locks: Remove redundant assignment to cmd (diff)
downloadlinux-42d0c4bdf753063b6eec55415003184d3ca24f6e.tar.xz
linux-42d0c4bdf753063b6eec55415003184d3ca24f6e.zip
filelocks: use mount idmapping for setlease permission check
A user should be allowed to take out a lease via an idmapped mount if the fsuid matches the mapped uid of the inode. generic_setlease() is checking the unmapped inode uid, causing these operations to be denied. Fix this by comparing against the mapped inode uid instead of the unmapped uid. Fixes: 9caccd41541a ("fs: introduce MOUNT_ATTR_IDMAP") Cc: stable@vger.kernel.org Signed-off-by: Seth Forshee (DigitalOcean) <sforshee@kernel.org> Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
-rw-r--r--fs/locks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c
index d82c4cacdfb9..df8b26a42524 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1863,9 +1863,10 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp,
void **priv)
{
struct inode *inode = file_inode(filp);
+ vfsuid_t vfsuid = i_uid_into_vfsuid(file_mnt_idmap(filp), inode);
int error;
- if ((!uid_eq(current_fsuid(), inode->i_uid)) && !capable(CAP_LEASE))
+ if ((!vfsuid_eq_kuid(vfsuid, current_fsuid())) && !capable(CAP_LEASE))
return -EACCES;
if (!S_ISREG(inode->i_mode))
return -EINVAL;