]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Mar 2023 07:50:39 +0000 (08:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Mar 2023 07:50:39 +0000 (08:50 +0100)
queue-5.15/filelocks-use-mount-idmapping-for-setlease-permission-check.patch

index 92ccb195432eae17976f11eae11dbe5a0048e346..eea34dfb3da2d1c3538fdfb6e667eabcb464b5e8 100644 (file)
@@ -29,11 +29,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        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;