Skip to contentSkip to conversation

futex: Add error coverage tests for wait, wake and cmp_requeue

PATCH Superseded Michael Menasherov via ltp 2 participants 6 messages May 26

v13 of 17 Superseded Latest is v17 →

lore
Share & tools
lore
#0 lore raw

v13 cover futex: Add error coverage tests for wait, wake and cmp_requeue

Improve error handling coverage for futex syscalls by adding tests for missing error conditions that were previously untested.

futex_wait06 verifies EFAULT is returned when uaddr or timeout points to unmapped memory.

futex_wait07 verifies EINTR is returned when futex_wait() is interrupted by a signal.

futex_wake05 verifies EFAULT is returned when uaddr points to unmapped or PROT_NONE memory.

futex_cmp_requeue03 verifies EFAULT is returned when uaddr or uaddr2 points to unmapped or inaccessible (PROT_NONE) memory.

v13:
- Each runtest/syscalls entry is now in its own patch, not all in patch 1/4, so each patch is self-contained and bisect-safe
- futex_wake05: add missing blank line between system and local includes
- futex_cmp_requeue03: fix comment — get_futex_key() validates both addresses before the *uaddr == val check, not after

Michael Menasherov (4):
futex_wait06: Add EFAULT error coverage test
futex_wait07: Add EINTR error coverage test
futex_wake05: Add EFAULT error coverage test
futex_cmp_requeue03: Add EFAULT error coverage test

 runtest/syscalls                              |  4 +
 testcases/kernel/syscalls/futex/.gitignore    |  4 +
 .../syscalls/futex/futex_cmp_requeue03.c      | 99 +++++++++++++++++++
 .../kernel/syscalls/futex/futex_wait06.c      | 75 ++++++++++++++
 .../kernel/syscalls/futex/futex_wait07.c      | 89 +++++++++++++++++
 .../kernel/syscalls/futex/futex_wake05.c      | 89 +++++++++++++++++
 6 files changed, 360 insertions(+)
 create mode 100644 testcases/kernel/syscalls/futex/futex_cmp_requeue03.c
 create mode 100644 testcases/kernel/syscalls/futex/futex_wait06.c
 create mode 100644 testcases/kernel/syscalls/futex/futex_wait07.c
 create mode 100644 testcases/kernel/syscalls/futex/futex_wake05.c
Signature · 5 lines
2.54.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

PATCH v13 1/4 futex_wait06: Add EFAULT error coverage test

futex(FUTEX_WAIT) has no existing test for EFAULT. Add coverage for the cases where uaddr points to unmapped memory and where the timeout pointer is invalid.

---
 runtest/syscalls                              |  1 +
 testcases/kernel/syscalls/futex/.gitignore    |  1 +
 .../kernel/syscalls/futex/futex_wait06.c      | 75 +++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 testcases/kernel/syscalls/futex/futex_wait06.c
runtest/syscalls +1 -0
index f790e8f84..7d5ea849e 100644
@@ -1868,6 +1868,7 @@ futex_wait02 futex_wait02
 futex_wait03 futex_wait03
 futex_wait04 futex_wait04
 futex_wait05 futex_wait05
+futex_wait06 futex_wait06
 futex_waitv01 futex_waitv01
 futex_waitv02 futex_waitv02
 futex_waitv03 futex_waitv03
testcases/kernel/syscalls/futex/.gitignore +1 -0
index 9d08ba7d3..56596dcb4 100644
@@ -13,3 +13,4 @@
 /futex_waitv01
 /futex_waitv02
 /futex_waitv03
+/futex_wait06
testcases/kernel/syscalls/futex/futex_wait06.c new file +75 -0

75 lines not on this page · raw message

Signature · 5 lines
2.54.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Re: [LTP] futex_wait06: Add EFAULT error coverage test

Hi Michael,

Quoted 1 line · Michael Menasherov

futex_wait06: Add EFAULT error coverage test

[...]

Patches 1-3 look good to me. One comment issue in patch 4 below.

--- [PATCH 4/4] ---

Quoted 10 lines · Michael Menasherov

futex_cmp_requeue03: Add EFAULT error coverage test

+/*\
+ * Check that futex(FUTEX_CMP_REQUEUE) returns EFAULT when uaddr or
+ * uaddr2 points to unmapped memory, or when uaddr points to memory
+ * without read permission (PROT_NONE).
+ *
+ * get_futex_key() is called for both uaddr and uaddr2 before the
+ * *uaddr == val check; futex_var and val are both FUTEX_INITIALIZER.
+ */

The comment explains the key-ordering for the uaddr2 case but omits why opflags=0 (no FUTEX_PRIVATE_FLAG) is required. With FUTEX_PRIVATE_FLAG, get_futex_key(uaddr2) succeeds using a virtual-address key with no physical page resolution, so the call returns 0 (no waiters) rather than EFAULT for the "uaddr2 unmapped" and "uaddr PROT_NONE" cases. Please add a note similar to the one in futex_wake05, e.g.:

The test uses opflags=0 (no FUTEX_PRIVATE_FLAG) so get_futex_key() takes the shared-futex path and resolves the physical page; this lookup fails with EFAULT for unmapped and PROT_NONE addresses.

The code itself (opflags=0 in the call) is correct; the comment just needs to explain why.

---
Note:

The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.

Regards,
LTP AI Reviewer

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

PATCH v13 2/4 futex_wait07: Add EINTR error coverage test

In reply to Michael Menasherov via ltp

futex(FUTEX_WAIT) has no existing test for EINTR. Add coverage for the case where the wait is interrupted by a signal before the futex word changes.

---
 runtest/syscalls                              |  1 +
 testcases/kernel/syscalls/futex/.gitignore    |  1 +
 .../kernel/syscalls/futex/futex_wait07.c      | 89 +++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 testcases/kernel/syscalls/futex/futex_wait07.c
runtest/syscalls +1 -0
index 7d5ea849e..e6c5d5112 100644
@@ -1869,6 +1869,7 @@ futex_wait03 futex_wait03
 futex_wait04 futex_wait04
 futex_wait05 futex_wait05
 futex_wait06 futex_wait06
+futex_wait07 futex_wait07
 futex_waitv01 futex_waitv01
 futex_waitv02 futex_waitv02
 futex_waitv03 futex_waitv03
testcases/kernel/syscalls/futex/.gitignore +1 -0
index 56596dcb4..74ac9a926 100644
@@ -14,3 +14,4 @@
 /futex_waitv02
 /futex_waitv03
 /futex_wait06
+/futex_wait07
testcases/kernel/syscalls/futex/futex_wait07.c new file +89 -0

89 lines not on this page · raw message

Signature · 5 lines
2.54.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

PATCH v13 3/4 futex_wake05: Add EFAULT error coverage test

In reply to Michael Menasherov via ltp

futex(FUTEX_WAKE) has no existing test for EFAULT. Add coverage for the cases where uaddr points to unmapped or PROT_NONE memory.

---
 runtest/syscalls                              |  1 +
 testcases/kernel/syscalls/futex/.gitignore    |  1 +
 .../kernel/syscalls/futex/futex_wake05.c      | 89 +++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 testcases/kernel/syscalls/futex/futex_wake05.c
runtest/syscalls +1 -0
index e6c5d5112..8c4d9be6c 100644
@@ -1877,6 +1877,7 @@ futex_wake01 futex_wake01
 futex_wake02 futex_wake02
 futex_wake03 futex_wake03
 futex_wake04 futex_wake04
+futex_wake05 futex_wake05
 futex_wait_bitset01 futex_wait_bitset01
 
 memfd_create01 memfd_create01
testcases/kernel/syscalls/futex/.gitignore +1 -0
index 74ac9a926..c11546e07 100644
@@ -15,3 +15,4 @@
 /futex_waitv03
 /futex_wait06
 /futex_wait07
+/futex_wake05
testcases/kernel/syscalls/futex/futex_wake05.c new file +89 -0

89 lines not on this page · raw message

Signature · 5 lines
2.54.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw

PATCH v13 4/4 futex_cmp_requeue03: Add EFAULT error coverage test

In reply to Michael Menasherov via ltp

futex(FUTEX_CMP_REQUEUE) has no existing test for EFAULT. Add coverage for the cases where uaddr or uaddr2 points to unmapped or inaccessible (PROT_NONE) memory.

---
 runtest/syscalls                              |  1 +
 testcases/kernel/syscalls/futex/.gitignore    |  1 +
 .../syscalls/futex/futex_cmp_requeue03.c      | 99 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 testcases/kernel/syscalls/futex/futex_cmp_requeue03.c
runtest/syscalls +1 -0
index 8c4d9be6c..87bd5aeac 100644
@@ -1863,6 +1863,7 @@ perf_event_open02 perf_event_open02
 
 futex_cmp_requeue01 futex_cmp_requeue01
 futex_cmp_requeue02 futex_cmp_requeue02
+futex_cmp_requeue03 futex_cmp_requeue03
 futex_wait01 futex_wait01
 futex_wait02 futex_wait02
 futex_wait03 futex_wait03
testcases/kernel/syscalls/futex/.gitignore +1 -0
index c11546e07..231b6bd25 100644
@@ -16,3 +16,4 @@
 /futex_wait06
 /futex_wait07
 /futex_wake05
+/futex_cmp_requeue03
testcases/kernel/syscalls/futex/futex_cmp_requeue03.c new file +99 -0

99 lines not on this page · raw message

Signature · 5 lines
2.54.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp