Konstantin Demin
8cbaf1dea2
3rd patchs (in alphabetical order): - bbr3 - ntsync5 - openwrt - pf-kernel - xanmod - zen no configuration changes for now
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From 7891b7d15abd12975aebb955821fbc43353b45d6 Mon Sep 17 00:00:00 2001
|
|
From: Elizabeth Figura <zfigura@codeweavers.com>
|
|
Date: Sun, 19 May 2024 15:24:37 -0500
|
|
Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_READ.
|
|
|
|
This corresponds to the NT syscall NtQueryMutant().
|
|
|
|
This returns the recursion count, owner, and abandoned state of the mutex.
|
|
|
|
Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
|
|
---
|
|
drivers/misc/ntsync.c | 28 ++++++++++++++++++++++++++++
|
|
include/uapi/linux/ntsync.h | 1 +
|
|
2 files changed, 29 insertions(+)
|
|
|
|
--- a/drivers/misc/ntsync.c
|
|
+++ b/drivers/misc/ntsync.c
|
|
@@ -607,6 +607,32 @@ static int ntsync_sem_read(struct ntsync
|
|
return 0;
|
|
}
|
|
|
|
+static int ntsync_mutex_read(struct ntsync_obj *mutex, void __user *argp)
|
|
+{
|
|
+ struct ntsync_mutex_args __user *user_args = argp;
|
|
+ struct ntsync_device *dev = mutex->dev;
|
|
+ struct ntsync_mutex_args args;
|
|
+ bool all;
|
|
+ int ret;
|
|
+
|
|
+ if (mutex->type != NTSYNC_TYPE_MUTEX)
|
|
+ return -EINVAL;
|
|
+
|
|
+ args.mutex = 0;
|
|
+
|
|
+ all = ntsync_lock_obj(dev, mutex);
|
|
+
|
|
+ args.count = mutex->u.mutex.count;
|
|
+ args.owner = mutex->u.mutex.owner;
|
|
+ ret = mutex->u.mutex.ownerdead ? -EOWNERDEAD : 0;
|
|
+
|
|
+ ntsync_unlock_obj(dev, mutex, all);
|
|
+
|
|
+ if (copy_to_user(user_args, &args, sizeof(args)))
|
|
+ return -EFAULT;
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static int ntsync_obj_release(struct inode *inode, struct file *file)
|
|
{
|
|
struct ntsync_obj *obj = file->private_data;
|
|
@@ -632,6 +658,8 @@ static long ntsync_obj_ioctl(struct file
|
|
return ntsync_mutex_unlock(obj, argp);
|
|
case NTSYNC_IOC_MUTEX_KILL:
|
|
return ntsync_mutex_kill(obj, argp);
|
|
+ case NTSYNC_IOC_MUTEX_READ:
|
|
+ return ntsync_mutex_read(obj, argp);
|
|
case NTSYNC_IOC_EVENT_SET:
|
|
return ntsync_event_set(obj, argp, false);
|
|
case NTSYNC_IOC_EVENT_RESET:
|
|
--- a/include/uapi/linux/ntsync.h
|
|
+++ b/include/uapi/linux/ntsync.h
|
|
@@ -55,5 +55,6 @@ struct ntsync_wait_args {
|
|
#define NTSYNC_IOC_EVENT_RESET _IOR ('N', 0x89, __u32)
|
|
#define NTSYNC_IOC_EVENT_PULSE _IOR ('N', 0x8a, __u32)
|
|
#define NTSYNC_IOC_SEM_READ _IOR ('N', 0x8b, struct ntsync_sem_args)
|
|
+#define NTSYNC_IOC_MUTEX_READ _IOR ('N', 0x8c, struct ntsync_mutex_args)
|
|
|
|
#endif
|