* [PATCH 0/4] ntsync documentation, selftests, and owner validation
@ 2026-06-28 2:42 Iván Ezequiel Rodriguez
2026-06-28 2:42 ` [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h Iván Ezequiel Rodriguez
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Iván Ezequiel Rodriguez @ 2026-06-28 2:42 UTC (permalink / raw)
To: zfigura; +Cc: wine-devel, linux-kernel, Iván Ezequiel Rodriguez
This series improves ntsync without changing wait/wake semantics:
1/4 — Align Documentation/userspace-api/ntsync.rst with
include/uapi/linux/ntsync.h (ioctl macro names and struct layout).
2/4 — Fix wake_all selftest: CREATE_EVENT returns an fd, not zero.
3/4 — Add selftests for documented EINVAL cases (zero owner, non-zero
pad, cross-instance object use).
4/4 — Reject wait ioctls when owner is zero, matching the documented
uAPI (3/4 depends on 4/4 for the owner tests).
Patch 4/4 closes a spec gap: Documentation/userspace-api/ntsync.rst
requires EINVAL when wait owner is zero, but setup_wait() only validated
pad and flags. Unlock/kill mutex ioctls already reject owner == 0.
Testing:
- scripts/checkpatch.pl --strict --no-tree: clean (4/4 patches)
- make headers && make -C tools/testing/selftests TARGETS=drivers/ntsync
- Kernel 7.1.0-ntsync-test+ (CONFIG_NTSYNC=y), QEMU x86_64 initramfs:
tools/testing/selftests/drivers/ntsync/ntsync — 12/12 PASS,
including wake_all and wait_args_validation
- On 6.17.0-35-generic with the distro ntsync.ko (without patch 4/4):
wait_args_validation fails on owner==0 (wait proceeds instead of
EINVAL), confirming the gap this series fixes
Elizabeth Figura <zfigura@codeweavers.com>
wine-devel@winehq.org
---
Documentation/userspace-api/ntsync.rst | 22 +++++-----
tools/testing/selftests/drivers/ntsync/ntsync.c | 45 ++++++++++++++++++++
drivers/misc/ntsync.c | 3 ++
3 files changed, 59 insertions(+), 11 deletions(-)
Iván Ezequiel Rodriguez (4):
docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h
selftests: ntsync: fix wake_all CREATE_EVENT fd expectation
selftests: ntsync: add wait argument validation tests
ntsync: reject wait ioctls with zero owner
--
2.43.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h
2026-06-28 2:42 [PATCH 0/4] ntsync documentation, selftests, and owner validation Iván Ezequiel Rodriguez
@ 2026-06-28 2:42 ` Iván Ezequiel Rodriguez
2026-07-01 16:37 ` Elizabeth Figura
2026-06-28 2:42 ` [PATCH 2/4] selftests: ntsync: fix wake_all CREATE_EVENT fd expectation Iván Ezequiel Rodriguez
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Iván Ezequiel Rodriguez @ 2026-06-28 2:42 UTC (permalink / raw)
To: zfigura; +Cc: wine-devel, linux-kernel, Iván Ezequiel Rodriguez
The userspace-api reference used stale macro names (SEM_POST, SET_EVENT,
READ_*, KILL_OWNER) and struct field order that did not match
include/uapi/linux/ntsync.h. Update the documentation to match the
published uapi so Wine and other consumers grep the correct symbols.
Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
---
Documentation/userspace-api/ntsync.rst | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Documentation/userspace-api/ntsync.rst b/Documentation/userspace-api/ntsync.rst
index 25e7c4aef968..535585331380 100644
--- a/Documentation/userspace-api/ntsync.rst
+++ b/Documentation/userspace-api/ntsync.rst
@@ -83,18 +83,18 @@ structures used in ioctl calls::
};
struct ntsync_event_args {
- __u32 signaled;
__u32 manual;
+ __u32 signaled;
};
struct ntsync_wait_args {
__u64 timeout;
__u64 objs;
__u32 count;
- __u32 owner;
__u32 index;
- __u32 alert;
__u32 flags;
+ __u32 owner;
+ __u32 alert;
__u32 pad;
};
@@ -152,7 +152,7 @@ The ioctls on the device file are as follows:
The ioctls on the individual objects are as follows:
-.. c:macro:: NTSYNC_IOC_SEM_POST
+.. c:macro:: NTSYNC_IOC_SEM_RELEASE
Post to a semaphore object. Takes a pointer to a 32-bit integer,
which on input holds the count to be added to the semaphore, and on
@@ -186,7 +186,7 @@ The ioctls on the individual objects are as follows:
unowned and signaled, and eligible threads waiting on it will be
woken as appropriate.
-.. c:macro:: NTSYNC_IOC_SET_EVENT
+.. c:macro:: NTSYNC_IOC_EVENT_SET
Signal an event object. Takes a pointer to a 32-bit integer, which on
output contains the previous state of the event.
@@ -194,12 +194,12 @@ The ioctls on the individual objects are as follows:
Eligible threads will be woken, and auto-reset events will be
designaled appropriately.
-.. c:macro:: NTSYNC_IOC_RESET_EVENT
+.. c:macro:: NTSYNC_IOC_EVENT_RESET
Designal an event object. Takes a pointer to a 32-bit integer, which
on output contains the previous state of the event.
-.. c:macro:: NTSYNC_IOC_PULSE_EVENT
+.. c:macro:: NTSYNC_IOC_EVENT_PULSE
Wake threads waiting on an event object while leaving it in an
unsignaled state. Takes a pointer to a 32-bit integer, which on
@@ -213,7 +213,7 @@ The ioctls on the individual objects are as follows:
afterwards, and a simultaneous read operation will always report the
event as unsignaled.
-.. c:macro:: NTSYNC_IOC_READ_SEM
+.. c:macro:: NTSYNC_IOC_SEM_READ
Read the current state of a semaphore object. Takes a pointer to
struct :c:type:`ntsync_sem_args`, which is used as follows:
@@ -225,7 +225,7 @@ The ioctls on the individual objects are as follows:
* - ``max``
- On output, contains the maximum count of the semaphore.
-.. c:macro:: NTSYNC_IOC_READ_MUTEX
+.. c:macro:: NTSYNC_IOC_MUTEX_READ
Read the current state of a mutex object. Takes a pointer to struct
:c:type:`ntsync_mutex_args`, which is used as follows:
@@ -242,7 +242,7 @@ The ioctls on the individual objects are as follows:
``EOWNERDEAD``. In this case, ``count`` and ``owner`` are set to
zero.
-.. c:macro:: NTSYNC_IOC_READ_EVENT
+.. c:macro:: NTSYNC_IOC_EVENT_READ
Read the current state of an event object. Takes a pointer to struct
:c:type:`ntsync_event_args`, which is used as follows:
@@ -255,7 +255,7 @@ The ioctls on the individual objects are as follows:
- On output, contains 1 if the event is a manual-reset event,
and 0 otherwise.
-.. c:macro:: NTSYNC_IOC_KILL_OWNER
+.. c:macro:: NTSYNC_IOC_MUTEX_KILL
Mark a mutex as unowned and abandoned if it is owned by the given
owner. Takes an input-only pointer to a 32-bit integer denoting the
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] selftests: ntsync: fix wake_all CREATE_EVENT fd expectation
2026-06-28 2:42 [PATCH 0/4] ntsync documentation, selftests, and owner validation Iván Ezequiel Rodriguez
2026-06-28 2:42 ` [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h Iván Ezequiel Rodriguez
@ 2026-06-28 2:42 ` Iván Ezequiel Rodriguez
2026-07-01 16:38 ` Elizabeth Figura
2026-06-28 2:42 ` [PATCH 3/4] selftests: ntsync: add wait argument validation tests Iván Ezequiel Rodriguez
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Iván Ezequiel Rodriguez @ 2026-06-28 2:42 UTC (permalink / raw)
To: zfigura; +Cc: wine-devel, linux-kernel, Iván Ezequiel Rodriguez
wake_all used EXPECT_EQ(0, objs[3]) after NTSYNC_IOC_CREATE_EVENT.
The ioctl returns a non-negative file descriptor on success; check
EXPECT_LE(0, objs[3]) like the other CREATE_* paths. The incorrect
expectation was noted on list (Mar 2025) but is still present in
mainline.
Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
---
tools/testing/selftests/drivers/ntsync/ntsync.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c
index e6a37214aa46..12b4b81edf7f 100644
--- a/tools/testing/selftests/drivers/ntsync/ntsync.c
+++ b/tools/testing/selftests/drivers/ntsync/ntsync.c
@@ -968,7 +968,7 @@ TEST(wake_all)
auto_event_args.manual = false;
auto_event_args.signaled = true;
objs[3] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &auto_event_args);
- EXPECT_EQ(0, objs[3]);
+ EXPECT_LE(0, objs[3]);
wait_args.timeout = get_abs_timeout(1000);
wait_args.objs = (uintptr_t)objs;
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] selftests: ntsync: add wait argument validation tests
2026-06-28 2:42 [PATCH 0/4] ntsync documentation, selftests, and owner validation Iván Ezequiel Rodriguez
2026-06-28 2:42 ` [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h Iván Ezequiel Rodriguez
2026-06-28 2:42 ` [PATCH 2/4] selftests: ntsync: fix wake_all CREATE_EVENT fd expectation Iván Ezequiel Rodriguez
@ 2026-06-28 2:42 ` Iván Ezequiel Rodriguez
2026-07-01 16:38 ` Elizabeth Figura
2026-06-28 2:42 ` [PATCH 4/4] ntsync: reject wait ioctls with zero owner Iván Ezequiel Rodriguez
2026-07-01 16:45 ` [PATCH 0/4] ntsync documentation, selftests, and owner validation Elizabeth Figura
4 siblings, 1 reply; 10+ messages in thread
From: Iván Ezequiel Rodriguez @ 2026-06-28 2:42 UTC (permalink / raw)
To: zfigura; +Cc: wine-devel, linux-kernel, Iván Ezequiel Rodriguez
Add coverage for documented EINVAL cases: zero owner on wait any/all,
non-zero pad, and objects from a different /dev/ntsync instance.
Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
---
.../testing/selftests/drivers/ntsync/ntsync.c | 44 +++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c
index 12b4b81edf7f..c9fe4d5987ec 100644
--- a/tools/testing/selftests/drivers/ntsync/ntsync.c
+++ b/tools/testing/selftests/drivers/ntsync/ntsync.c
@@ -1340,4 +1340,48 @@ TEST(stress_wait)
close(stress_device);
}
+TEST(wait_args_validation)
+{
+ struct ntsync_sem_args sem_args = { .count = 1, .max = 1 };
+ struct ntsync_wait_args wait_args = {0};
+ struct timespec timeout;
+ int fd, fd2, sem, ret;
+ __u32 index;
+
+ fd = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
+ ASSERT_GE(fd, 0);
+
+ fd2 = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
+ ASSERT_GE(fd2, 0);
+
+ sem = ioctl(fd, NTSYNC_IOC_CREATE_SEM, &sem_args);
+ EXPECT_GE(sem, 0);
+
+ ret = wait_any(fd, 1, &sem, 0, &index);
+ EXPECT_EQ(-1, ret);
+ EXPECT_EQ(EINVAL, errno);
+
+ ret = wait_all(fd, 1, &sem, 0, &index);
+ EXPECT_EQ(-1, ret);
+ EXPECT_EQ(EINVAL, errno);
+
+ clock_gettime(CLOCK_MONOTONIC, &timeout);
+ wait_args.timeout = timeout.tv_sec * 1000000000ULL + timeout.tv_nsec;
+ wait_args.count = 0;
+ wait_args.objs = 0;
+ wait_args.owner = 123;
+ wait_args.pad = 1;
+ ret = ioctl(fd, NTSYNC_IOC_WAIT_ANY, &wait_args);
+ EXPECT_EQ(-1, ret);
+ EXPECT_EQ(EINVAL, errno);
+
+ ret = wait_any(fd2, 1, &sem, 123, &index);
+ EXPECT_EQ(-1, ret);
+ EXPECT_EQ(EINVAL, errno);
+
+ close(sem);
+ close(fd2);
+ close(fd);
+}
+
TEST_HARNESS_MAIN
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] ntsync: reject wait ioctls with zero owner
2026-06-28 2:42 [PATCH 0/4] ntsync documentation, selftests, and owner validation Iván Ezequiel Rodriguez
` (2 preceding siblings ...)
2026-06-28 2:42 ` [PATCH 3/4] selftests: ntsync: add wait argument validation tests Iván Ezequiel Rodriguez
@ 2026-06-28 2:42 ` Iván Ezequiel Rodriguez
2026-07-01 16:38 ` Elizabeth Figura
2026-07-01 16:45 ` [PATCH 0/4] ntsync documentation, selftests, and owner validation Elizabeth Figura
4 siblings, 1 reply; 10+ messages in thread
From: Iván Ezequiel Rodriguez @ 2026-06-28 2:42 UTC (permalink / raw)
To: zfigura; +Cc: wine-devel, linux-kernel, Iván Ezequiel Rodriguez
setup_wait() already validates pad and flags but not owner, while
Documentation/userspace-api/ntsync.rst requires EINVAL when owner is
zero. Reject early before queueing waiters.
Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
---
drivers/misc/ntsync.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 02c9d1192812..4a805919bb0c 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -875,6 +875,9 @@ static int setup_wait(struct ntsync_device *dev,
if (args->pad || (args->flags & ~NTSYNC_WAIT_REALTIME))
return -EINVAL;
+ if (!args->owner)
+ return -EINVAL;
+
if (size >= sizeof(fds))
return -EINVAL;
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h
2026-06-28 2:42 ` [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h Iván Ezequiel Rodriguez
@ 2026-07-01 16:37 ` Elizabeth Figura
0 siblings, 0 replies; 10+ messages in thread
From: Elizabeth Figura @ 2026-07-01 16:37 UTC (permalink / raw)
To: Iván Ezequiel Rodriguez; +Cc: wine-devel, linux-kernel
On Saturday, 27 June 2026 21:42:36 CDT Iván Ezequiel Rodriguez wrote:
> The userspace-api reference used stale macro names (SEM_POST, SET_EVENT,
> READ_*, KILL_OWNER) and struct field order that did not match
> include/uapi/linux/ntsync.h. Update the documentation to match the
> published uapi so Wine and other consumers grep the correct symbols.
>
> Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
> ---
> Documentation/userspace-api/ntsync.rst | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/userspace-api/ntsync.rst b/Documentation/userspace-api/ntsync.rst
> index 25e7c4aef968..535585331380 100644
> --- a/Documentation/userspace-api/ntsync.rst
> +++ b/Documentation/userspace-api/ntsync.rst
> @@ -83,18 +83,18 @@ structures used in ioctl calls::
> };
>
> struct ntsync_event_args {
> - __u32 signaled;
> __u32 manual;
> + __u32 signaled;
> };
>
> struct ntsync_wait_args {
> __u64 timeout;
> __u64 objs;
> __u32 count;
> - __u32 owner;
> __u32 index;
> - __u32 alert;
> __u32 flags;
> + __u32 owner;
> + __u32 alert;
> __u32 pad;
> };
>
> @@ -152,7 +152,7 @@ The ioctls on the device file are as follows:
>
> The ioctls on the individual objects are as follows:
>
> -.. c:macro:: NTSYNC_IOC_SEM_POST
> +.. c:macro:: NTSYNC_IOC_SEM_RELEASE
>
> Post to a semaphore object. Takes a pointer to a 32-bit integer,
> which on input holds the count to be added to the semaphore, and on
> @@ -186,7 +186,7 @@ The ioctls on the individual objects are as follows:
> unowned and signaled, and eligible threads waiting on it will be
> woken as appropriate.
>
> -.. c:macro:: NTSYNC_IOC_SET_EVENT
> +.. c:macro:: NTSYNC_IOC_EVENT_SET
>
> Signal an event object. Takes a pointer to a 32-bit integer, which on
> output contains the previous state of the event.
> @@ -194,12 +194,12 @@ The ioctls on the individual objects are as follows:
> Eligible threads will be woken, and auto-reset events will be
> designaled appropriately.
>
> -.. c:macro:: NTSYNC_IOC_RESET_EVENT
> +.. c:macro:: NTSYNC_IOC_EVENT_RESET
>
> Designal an event object. Takes a pointer to a 32-bit integer, which
> on output contains the previous state of the event.
>
> -.. c:macro:: NTSYNC_IOC_PULSE_EVENT
> +.. c:macro:: NTSYNC_IOC_EVENT_PULSE
>
> Wake threads waiting on an event object while leaving it in an
> unsignaled state. Takes a pointer to a 32-bit integer, which on
> @@ -213,7 +213,7 @@ The ioctls on the individual objects are as follows:
> afterwards, and a simultaneous read operation will always report the
> event as unsignaled.
>
> -.. c:macro:: NTSYNC_IOC_READ_SEM
> +.. c:macro:: NTSYNC_IOC_SEM_READ
>
> Read the current state of a semaphore object. Takes a pointer to
> struct :c:type:`ntsync_sem_args`, which is used as follows:
> @@ -225,7 +225,7 @@ The ioctls on the individual objects are as follows:
> * - ``max``
> - On output, contains the maximum count of the semaphore.
>
> -.. c:macro:: NTSYNC_IOC_READ_MUTEX
> +.. c:macro:: NTSYNC_IOC_MUTEX_READ
>
> Read the current state of a mutex object. Takes a pointer to struct
> :c:type:`ntsync_mutex_args`, which is used as follows:
> @@ -242,7 +242,7 @@ The ioctls on the individual objects are as follows:
> ``EOWNERDEAD``. In this case, ``count`` and ``owner`` are set to
> zero.
>
> -.. c:macro:: NTSYNC_IOC_READ_EVENT
> +.. c:macro:: NTSYNC_IOC_EVENT_READ
>
> Read the current state of an event object. Takes a pointer to struct
> :c:type:`ntsync_event_args`, which is used as follows:
> @@ -255,7 +255,7 @@ The ioctls on the individual objects are as follows:
> - On output, contains 1 if the event is a manual-reset event,
> and 0 otherwise.
>
> -.. c:macro:: NTSYNC_IOC_KILL_OWNER
> +.. c:macro:: NTSYNC_IOC_MUTEX_KILL
>
> Mark a mutex as unowned and abandoned if it is owned by the given
> owner. Takes an input-only pointer to a 32-bit integer denoting the
>
Reviewed-by: Elizabeth Figura <zfigura@codeweavers.com>
--
This was already sent as <https://lore.kernel.org/all/20250314071454.201697-5-suhui@nfschina.com/>, which was never applied, although that did not include modifications to the struct field order.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] selftests: ntsync: fix wake_all CREATE_EVENT fd expectation
2026-06-28 2:42 ` [PATCH 2/4] selftests: ntsync: fix wake_all CREATE_EVENT fd expectation Iván Ezequiel Rodriguez
@ 2026-07-01 16:38 ` Elizabeth Figura
0 siblings, 0 replies; 10+ messages in thread
From: Elizabeth Figura @ 2026-07-01 16:38 UTC (permalink / raw)
To: Iván Ezequiel Rodriguez; +Cc: wine-devel, linux-kernel
On Saturday, 27 June 2026 21:42:37 CDT Iván Ezequiel Rodriguez wrote:
> wake_all used EXPECT_EQ(0, objs[3]) after NTSYNC_IOC_CREATE_EVENT.
> The ioctl returns a non-negative file descriptor on success; check
> EXPECT_LE(0, objs[3]) like the other CREATE_* paths. The incorrect
> expectation was noted on list (Mar 2025) but is still present in
> mainline.
>
> Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
> ---
> tools/testing/selftests/drivers/ntsync/ntsync.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c
> index e6a37214aa46..12b4b81edf7f 100644
> --- a/tools/testing/selftests/drivers/ntsync/ntsync.c
> +++ b/tools/testing/selftests/drivers/ntsync/ntsync.c
> @@ -968,7 +968,7 @@ TEST(wake_all)
> auto_event_args.manual = false;
> auto_event_args.signaled = true;
> objs[3] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &auto_event_args);
> - EXPECT_EQ(0, objs[3]);
> + EXPECT_LE(0, objs[3]);
>
> wait_args.timeout = get_abs_timeout(1000);
> wait_args.objs = (uintptr_t)objs;
>
Reviewed-by: Elizabeth Figura <zfigura@codeweavers.com>
--
This was already sent as <https://lore.kernel.org/all/20250314071454.201697-2-suhui@nfschina.com/> and never committed.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/4] selftests: ntsync: add wait argument validation tests
2026-06-28 2:42 ` [PATCH 3/4] selftests: ntsync: add wait argument validation tests Iván Ezequiel Rodriguez
@ 2026-07-01 16:38 ` Elizabeth Figura
0 siblings, 0 replies; 10+ messages in thread
From: Elizabeth Figura @ 2026-07-01 16:38 UTC (permalink / raw)
To: Iván Ezequiel Rodriguez; +Cc: wine-devel, linux-kernel
On Saturday, 27 June 2026 21:42:38 CDT Iván Ezequiel Rodriguez wrote:
> Add coverage for documented EINVAL cases: zero owner on wait any/all,
> non-zero pad, and objects from a different /dev/ntsync instance.
>
> Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
> ---
> .../testing/selftests/drivers/ntsync/ntsync.c | 44 +++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c
> index 12b4b81edf7f..c9fe4d5987ec 100644
> --- a/tools/testing/selftests/drivers/ntsync/ntsync.c
> +++ b/tools/testing/selftests/drivers/ntsync/ntsync.c
> @@ -1340,4 +1340,48 @@ TEST(stress_wait)
> close(stress_device);
> }
>
> +TEST(wait_args_validation)
> +{
> + struct ntsync_sem_args sem_args = { .count = 1, .max = 1 };
> + struct ntsync_wait_args wait_args = {0};
> + struct timespec timeout;
> + int fd, fd2, sem, ret;
> + __u32 index;
> +
> + fd = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
> + ASSERT_GE(fd, 0);
> +
> + fd2 = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
> + ASSERT_GE(fd2, 0);
> +
> + sem = ioctl(fd, NTSYNC_IOC_CREATE_SEM, &sem_args);
> + EXPECT_GE(sem, 0);
> +
> + ret = wait_any(fd, 1, &sem, 0, &index);
> + EXPECT_EQ(-1, ret);
> + EXPECT_EQ(EINVAL, errno);
> +
> + ret = wait_all(fd, 1, &sem, 0, &index);
> + EXPECT_EQ(-1, ret);
> + EXPECT_EQ(EINVAL, errno);
> +
> + clock_gettime(CLOCK_MONOTONIC, &timeout);
> + wait_args.timeout = timeout.tv_sec * 1000000000ULL + timeout.tv_nsec;
> + wait_args.count = 0;
> + wait_args.objs = 0;
> + wait_args.owner = 123;
> + wait_args.pad = 1;
> + ret = ioctl(fd, NTSYNC_IOC_WAIT_ANY, &wait_args);
> + EXPECT_EQ(-1, ret);
> + EXPECT_EQ(EINVAL, errno);
> +
> + ret = wait_any(fd2, 1, &sem, 123, &index);
> + EXPECT_EQ(-1, ret);
> + EXPECT_EQ(EINVAL, errno);
> +
> + close(sem);
> + close(fd2);
> + close(fd);
> +}
> +
> TEST_HARNESS_MAIN
>
Reviewed-by: Elizabeth Figura <zfigura@codeweavers.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] ntsync: reject wait ioctls with zero owner
2026-06-28 2:42 ` [PATCH 4/4] ntsync: reject wait ioctls with zero owner Iván Ezequiel Rodriguez
@ 2026-07-01 16:38 ` Elizabeth Figura
0 siblings, 0 replies; 10+ messages in thread
From: Elizabeth Figura @ 2026-07-01 16:38 UTC (permalink / raw)
To: Iván Ezequiel Rodriguez; +Cc: wine-devel, linux-kernel
On Saturday, 27 June 2026 21:42:39 CDT Iván Ezequiel Rodriguez wrote:
> setup_wait() already validates pad and flags but not owner, while
> Documentation/userspace-api/ntsync.rst requires EINVAL when owner is
> zero. Reject early before queueing waiters.
>
> Signed-off-by: Iván Ezequiel Rodriguez <ivanrwcm25@gmail.com>
> ---
> drivers/misc/ntsync.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
> index 02c9d1192812..4a805919bb0c 100644
> --- a/drivers/misc/ntsync.c
> +++ b/drivers/misc/ntsync.c
> @@ -875,6 +875,9 @@ static int setup_wait(struct ntsync_device *dev,
> if (args->pad || (args->flags & ~NTSYNC_WAIT_REALTIME))
> return -EINVAL;
>
> + if (!args->owner)
> + return -EINVAL;
> +
> if (size >= sizeof(fds))
> return -EINVAL;
>
>
Reviewed-by: Elizabeth Figura <zfigura@codeweavers.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/4] ntsync documentation, selftests, and owner validation
2026-06-28 2:42 [PATCH 0/4] ntsync documentation, selftests, and owner validation Iván Ezequiel Rodriguez
` (3 preceding siblings ...)
2026-06-28 2:42 ` [PATCH 4/4] ntsync: reject wait ioctls with zero owner Iván Ezequiel Rodriguez
@ 2026-07-01 16:45 ` Elizabeth Figura
4 siblings, 0 replies; 10+ messages in thread
From: Elizabeth Figura @ 2026-07-01 16:45 UTC (permalink / raw)
To: Iván Ezequiel Rodriguez; +Cc: wine-devel, linux-kernel
On Saturday, 27 June 2026 21:42:35 CDT Iván Ezequiel Rodriguez wrote:
> This series improves ntsync without changing wait/wake semantics:
>
> 1/4 — Align Documentation/userspace-api/ntsync.rst with
> include/uapi/linux/ntsync.h (ioctl macro names and struct layout).
>
> 2/4 — Fix wake_all selftest: CREATE_EVENT returns an fd, not zero.
>
> 3/4 — Add selftests for documented EINVAL cases (zero owner, non-zero
> pad, cross-instance object use).
>
> 4/4 — Reject wait ioctls when owner is zero, matching the documented
> uAPI (3/4 depends on 4/4 for the owner tests).
>
> Patch 4/4 closes a spec gap: Documentation/userspace-api/ntsync.rst
> requires EINVAL when wait owner is zero, but setup_wait() only validated
> pad and flags. Unlock/kill mutex ioctls already reject owner == 0.
>
> Testing:
> - scripts/checkpatch.pl --strict --no-tree: clean (4/4 patches)
> - make headers && make -C tools/testing/selftests TARGETS=drivers/ntsync
> - Kernel 7.1.0-ntsync-test+ (CONFIG_NTSYNC=y), QEMU x86_64 initramfs:
> tools/testing/selftests/drivers/ntsync/ntsync — 12/12 PASS,
> including wake_all and wait_args_validation
> - On 6.17.0-35-generic with the distro ntsync.ko (without patch 4/4):
> wait_args_validation fails on owner==0 (wait proceeds instead of
> EINVAL), confirming the gap this series fixes
>
> Elizabeth Figura <zfigura@codeweavers.com>
> wine-devel@winehq.org
> ---
> Documentation/userspace-api/ntsync.rst | 22 +++++-----
> tools/testing/selftests/drivers/ntsync/ntsync.c | 45 ++++++++++++++++++++
> drivers/misc/ntsync.c | 3 ++
> 3 files changed, 59 insertions(+), 11 deletions(-)
>
> Iván Ezequiel Rodriguez (4):
> docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h
> selftests: ntsync: fix wake_all CREATE_EVENT fd expectation
> selftests: ntsync: add wait argument validation tests
> ntsync: reject wait ioctls with zero owner
>
> --
> 2.43.0
>
Some of these changes overlap with changes already sent in <https://lore.kernel.org/all/20250314071454.201697-1-suhui@nfschina.com/>, which were never applied. This series does not overlap with patches 2/4 and 3/4 from that series.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2026-07-01 16:45 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-28 2:42 [PATCH 0/4] ntsync documentation, selftests, and owner validation Iván Ezequiel Rodriguez
2026-06-28 2:42 ` [PATCH 1/4] docs: ntsync: align uAPI ioctl names and struct layout with ntsync.h Iván Ezequiel Rodriguez
2026-07-01 16:37 ` Elizabeth Figura
2026-06-28 2:42 ` [PATCH 2/4] selftests: ntsync: fix wake_all CREATE_EVENT fd expectation Iván Ezequiel Rodriguez
2026-07-01 16:38 ` Elizabeth Figura
2026-06-28 2:42 ` [PATCH 3/4] selftests: ntsync: add wait argument validation tests Iván Ezequiel Rodriguez
2026-07-01 16:38 ` Elizabeth Figura
2026-06-28 2:42 ` [PATCH 4/4] ntsync: reject wait ioctls with zero owner Iván Ezequiel Rodriguez
2026-07-01 16:38 ` Elizabeth Figura
2026-07-01 16:45 ` [PATCH 0/4] ntsync documentation, selftests, and owner validation Elizabeth Figura
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox