syscalls/futex_cmp_requeue01.c: Add new test
PATCH v2 1/2 syscalls/futex_cmp_requeue01.c: Add new test
Check the basic functionality of futex(FUTEX_CMP_REQUEUE).
Signed-off-by Xiao Yang <[email protected]>
--- runtest/syscalls | 1 + testcases/kernel/syscalls/futex/.gitignore | 1 + testcases/kernel/syscalls/futex/Makefile | 1 + .../kernel/syscalls/futex/futex_cmp_requeue01.c | 132 +++++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 testcases/kernel/syscalls/futex/futex_cmp_requeue01.c
runtest/syscalls +1 -0
@@ -1549,6 +1549,7 @@ writev07 writev07 perf_event_open01 perf_event_open01 perf_event_open02 perf_event_open02 +futex_cmp_requeue01 futex_cmp_requeue01 futex_wait01 futex_wait01 futex_wait02 futex_wait02 futex_wait03 futex_wait03
testcases/kernel/syscalls/futex/.gitignore +1 -0
@@ -1,3 +1,4 @@ +/futex_cmp_requeue01 /futex_wait01 /futex_wait02 /futex_wait03
testcases/kernel/syscalls/futex/Makefile +1 -0
@@ -18,6 +18,7 @@ top_srcdir ?= ../../../.. +futex_cmp_requeue01: LDLIBS+=-lrt futex_wait02: LDLIBS+=-lrt futex_wake03: LDLIBS+=-lrt futex_wait03: CFLAGS+=-pthread
testcases/kernel/syscalls/futex/futex_cmp_requeue01.c new file +132 -0
132 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v2 2/2 syscalls/futex_cmp_requeue02.c: Add new test
Check various errnos for futex(FUTEX_CMP_REQUEUE).
It's also a regression test for CVE-2018-6927:fbe0e839d1e2 ("futex: Prevent overflow by strengthen input validation")
Signed-off-by Xiao Yang <[email protected]>
--- runtest/syscalls | 1 + testcases/kernel/syscalls/futex/.gitignore | 1 + testcases/kernel/syscalls/futex/Makefile | 1 + .../kernel/syscalls/futex/futex_cmp_requeue02.c | 76 ++++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 testcases/kernel/syscalls/futex/futex_cmp_requeue02.c
runtest/syscalls +1 -0
@@ -1550,6 +1550,7 @@ perf_event_open01 perf_event_open01 perf_event_open02 perf_event_open02 futex_cmp_requeue01 futex_cmp_requeue01 +futex_cmp_requeue02 futex_cmp_requeue02 futex_wait01 futex_wait01 futex_wait02 futex_wait02 futex_wait03 futex_wait03
testcases/kernel/syscalls/futex/.gitignore +1 -0
@@ -1,4 +1,5 @@ /futex_cmp_requeue01 +/futex_cmp_requeue02 /futex_wait01 /futex_wait02 /futex_wait03
testcases/kernel/syscalls/futex/Makefile +1 -0
@@ -19,6 +19,7 @@ top_srcdir ?= ../../../.. futex_cmp_requeue01: LDLIBS+=-lrt +futex_cmp_requeue02: LDLIBS+=-lrt futex_wait02: LDLIBS+=-lrt futex_wake03: LDLIBS+=-lrt futex_wait03: CFLAGS+=-pthread
testcases/kernel/syscalls/futex/futex_cmp_requeue02.c new file +76 -0
76 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v2 2/2 syscalls/futex_cmp_requeue02.c: Add new test
Hi!
Pushed, thanks.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/2 syscalls/futex_cmp_requeue01.c: Add new test
In reply to Xiao YangHi!
Pushed with following changes, thanks.
There was no point to repeat the numbers in the test structure three times, so I simplified the code with:
testcases/kernel/syscalls/futex/futex_cmp_requeue01.c +15 -17
@@ -25,17 +25,14 @@ static struct tcase {int num_waiters;int set_wakes;int set_requeues; -int exp_ret; -int exp_wakes; -int exp_requeues; } tcases[] = { - {10, 3, 7, 10, 3, 7}, - {10, 0, 10, 10, 0, 10}, - {10, 2, 6, 8, 2, 6}, - {100, 50, 50, 100, 50, 50}, - {100, 0, 70, 70, 0, 70}, - {1000, 100, 900, 1000, 100, 900}, - {1000, 300, 500, 800, 300, 500}, + {10, 3, 7}, + {10, 0, 10}, + {10, 2, 6}, + {100, 50, 50}, + {100, 0, 70}, + {1000, 100, 900}, + {1000, 300, 500}, }; static void do_child(void)
@@ -56,6 +53,7 @@ static void verify_futex_cmp_requeue(unsigned int n)int i, status;struct tcase *tc = &tcases[n];int pid[tc->num_waiters]; +int exp_ret = tc->set_wakes + tc->set_requeues;for (i =0 ; i < tc->num_waiters; i++) { pid[i] =SAFE_FORK ();
@@ -68,9 +66,9 @@ static void verify_futex_cmp_requeue(unsigned int n)TEST (futex_cmp_requeue (&futexes[0 ], futexes[0 ], &futexes[1 ], tc->set_wakes, tc->set_requeues,0 )); -if (TST_RET != tc->exp_ret) { +if (TST_RET != exp_ret) {tst_res (TFAIL ,"futex_cmp_requeue() returned %ld, expected %d" , -TST_RET , tc->exp_ret); +TST_RET , exp_ret); } num_requeues =futex_wake (&futexes[1 ], tc->num_waiters,0 );
@@ -88,24 +86,24 @@ static void verify_futex_cmp_requeue(unsigned int n)return ; } -if (num_requeues != tc->exp_requeues) { +if (num_requeues != tc->set_requeues) {tst_res (TFAIL ,"futex_cmp_requeue() requeues %d waiters, expected %d" , - num_requeues, tc->exp_requeues); + num_requeues, tc->set_requeues);return ; } -if (tc->num_waiters - num_requeues - num_waits != tc->exp_wakes) { +if (tc->num_waiters - num_requeues - num_waits != tc->set_wakes) {tst_res (TFAIL ,"futex_cmp_requeue() woke up %d waiters, expected %d" , tc->num_waiters - num_requeues - num_waits, - tc->exp_wakes); + tc->set_wakes);return ; }tst_res (TPASS ,"futex_cmp_requeue() woke up %d waiters and requeued %d waiters" , - tc->exp_wakes, tc->exp_requeues); + tc->set_wakes, tc->set_requeues); }static void setup (void )
Signature · 2 lines
Cyril Hrubis [email protected]