usb: gadget: f_hid: fix report descriptor allocation

[platform/kernel/linux-starfive.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 607f94a..1047ab2 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1300,6 +1300,7 @@ retry:
  out:
        spin_unlock(&ctx->flc_lock);
        percpu_up_read(&file_rwsem);
+       trace_posix_lock_inode(inode, request, error);
        /*
         * Free any unused locks.
         */
@@ -1308,7 +1309,6 @@ retry:
        if (new_fl2)
                locks_free_lock(new_fl2);
        locks_dispose_list(&dispose);
-       trace_posix_lock_inode(inode, request, error);
 
        return error;
 }
@@ -1862,9 +1862,10 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp,
                        void **priv)
 {
        struct inode *inode = locks_inode(filp);
+       vfsuid_t vfsuid = i_uid_into_vfsuid(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))
                return -EACCES;
        if (!S_ISREG(inode->i_mode))
                return -EINVAL;
@@ -2669,6 +2670,29 @@ int vfs_cancel_lock(struct file *filp, struct file_lock *fl)
 }
 EXPORT_SYMBOL_GPL(vfs_cancel_lock);
 
+/**
+ * vfs_inode_has_locks - are any file locks held on @inode?
+ * @inode: inode to check for locks
+ *
+ * Return true if there are any FL_POSIX or FL_FLOCK locks currently
+ * set on @inode.
+ */
+bool vfs_inode_has_locks(struct inode *inode)
+{
+       struct file_lock_context *ctx;
+       bool ret;
+
+       ctx = smp_load_acquire(&inode->i_flctx);
+       if (!ctx)
+               return false;
+
+       spin_lock(&ctx->flc_lock);
+       ret = !list_empty(&ctx->flc_posix) || !list_empty(&ctx->flc_flock);
+       spin_unlock(&ctx->flc_lock);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(vfs_inode_has_locks);
+
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>