From d5165cd82c2f40184f941f56d734b983968c1476 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 Mar 2023 08:50:39 +0100 Subject: [PATCH] fix up queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch --- ...ks-use-mount-idmapping-for-setlease-permission-check.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch b/queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch index 92ccb195432..eea34dfb3da 100644 --- a/queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch +++ b/queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch @@ -29,11 +29,11 @@ Signed-off-by: Greg Kroah-Hartman void **priv) { struct inode *inode = locks_inode(filp); -+ vfsuid_t vfsuid = i_uid_into_vfsuid(file_mnt_user_ns(filp), inode); ++ kuid_t uid = i_uid_into_mnt(file_mnt_user_ns(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)) ++ if ((!uid_eq(current_fsuid(), uid)) && !capable(CAP_LEASE)) return -EACCES; if (!S_ISREG(inode->i_mode)) return -EINVAL; -- 2.47.3