ntsync: Introduce NTSYNC_IOC_SEM_POST.

This corresponds to the NT syscall NtReleaseSemaphore().

This increases the semaphore's internal counter by the given value, and returns
the previous value. If the counter would overflow the defined maximum, the
function instead fails and returns -EOVERFLOW.

Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
Link: https://lore.kernel.org/r/20240329000621.148791-4-zfigura@codeweavers.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 20158ec148bc75bb580ed1e74e6c26b60e6d389b..3c2f743c58b00ca303a8e195c200e7876bae5f79 100644 (file)
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -10,7 +10,9 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
+#include <linux/overflow.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
 #include <uapi/linux/ntsync.h>
 
 #define NTSYNC_NAME    "ntsync"
@@ -31,23 +33,70 @@ enum ntsync_type {
  */
 
 struct ntsync_obj {
+       spinlock_t lock;
+
        enum ntsync_type type;
 
+       struct file *file;
+       struct ntsync_device *dev;
+
+       /* The following fields are protected by the object lock. */
        union {
                struct {
                        __u32 count;
                        __u32 max;
                } sem;
        } u;
-
-       struct file *file;
-       struct ntsync_device *dev;
 };
 
 struct ntsync_device {
        struct file *file;
 };
 
+/*
+ * Actually change the semaphore state, returning -EOVERFLOW if it is made
+ * invalid.
+ */
+static int post_sem_state(struct ntsync_obj *sem, __u32 count)
+{
+       __u32 sum;
+
+       lockdep_assert_held(&sem->lock);
+
+       if (check_add_overflow(sem->u.sem.count, count, &sum) ||
+           sum > sem->u.sem.max)
+               return -EOVERFLOW;
+
+       sem->u.sem.count = sum;
+       return 0;
+}
+
+static int ntsync_sem_post(struct ntsync_obj *sem, void __user *argp)
+{
+       __u32 __user *user_args = argp;
+       __u32 prev_count;
+       __u32 args;
+       int ret;
+
+       if (copy_from_user(&args, argp, sizeof(args)))
+               return -EFAULT;
+
+       if (sem->type != NTSYNC_TYPE_SEM)
+               return -EINVAL;
+
+       spin_lock(&sem->lock);
+
+       prev_count = sem->u.sem.count;
+       ret = post_sem_state(sem, args);
+
+       spin_unlock(&sem->lock);
+
+       if (!ret && put_user(prev_count, user_args))
+               ret = -EFAULT;
+
+       return ret;
+}
+
 static int ntsync_obj_release(struct inode *inode, struct file *file)
 {
        struct ntsync_obj *obj = file->private_data;
@@ -58,9 +107,25 @@ static int ntsync_obj_release(struct inode *inode, struct file *file)
        return 0;
 }
 
+static long ntsync_obj_ioctl(struct file *file, unsigned int cmd,
+                            unsigned long parm)
+{
+       struct ntsync_obj *obj = file->private_data;
+       void __user *argp = (void __user *)parm;
+
+       switch (cmd) {
+       case NTSYNC_IOC_SEM_POST:
+               return ntsync_sem_post(obj, argp);
+       default:
+               return -ENOIOCTLCMD;
+       }
+}
+
 static const struct file_operations ntsync_obj_fops = {
        .owner          = THIS_MODULE,
        .release        = ntsync_obj_release,
+       .unlocked_ioctl = ntsync_obj_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .llseek         = no_llseek,
 };
 
@@ -75,6 +140,7 @@ static struct ntsync_obj *ntsync_alloc_obj(struct ntsync_device *dev,
        obj->type = type;
        obj->dev = dev;
        get_file(dev->file);
+       spin_lock_init(&obj->lock);
 
        return obj;
 }

diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h
index 6a4867a6c97bc6f47f2681aa54df1162b489e8a2..dcfa38fdc93c61271b602ee6c2052d7f98d03662 100644 (file)
--- a/include/uapi/linux/ntsync.h
+++ b/include/uapi/linux/ntsync.h
@@ -18,4 +18,6 @@ struct ntsync_sem_args {
 
 #define NTSYNC_IOC_CREATE_SEM          _IOWR('N', 0x80, struct ntsync_sem_args)
 
+#define NTSYNC_IOC_SEM_POST            _IOWR('N', 0x81, __u32)
+
 #endif