[PATCH v4] syscalls/io_cancel: Setup context before running the test - linux-morello-ltp - op-lists.linaro.org

9 Jun 2023

The kernel might check for a valid context before checking the access
of the pointers. In such a case, it will return EINVAL instead of
EFAULT. Add an io_setup step to the test to ensure the io_cancel
syscall fails because of the intended cause.
Signed-off-by: Tudor Cretu tudor.cretu@arm.com
---
This patch doesn't have any dependency, but it's a dependency to the
following Morello Linux series:
  "Support aio shared memory usage in the Purecap apps"
v3..v4:
  - Remove memset from io_cancel02
v2..v3:
  - Apply a similar change to io_cancel02.c as well
Review branch:
    https://git.morello-project.org/tudcre01/morello-linux-ltp/-/commits/morello...
---
 .../kernel/syscalls/io_cancel/io_cancel01.c    | 18 +++++++++++++++---
 .../kernel/syscalls/io_cancel/io_cancel02.c    | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/testcases/kernel/syscalls/io_cancel/io_cancel01.c b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
index f7e8bd061ed7..18c73845cfd3 100644
--- a/testcases/kernel/syscalls/io_cancel/io_cancel01.c
+++ b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
@@ -18,11 +18,21 @@
 #include "tst_test.h"
 #include "lapi/syscalls.h"
-static void run(void)
+static aio_context_t ctx;
+
+static void setup(void)
+{
+	TST_EXP_PASS_SILENT(tst_syscall(__NR_io_setup, 1, &ctx));
+}
+
+static void cleanup(void)
 {
-	aio_context_t ctx;
+	if (ctx)
+		TST_EXP_PASS_SILENT(tst_syscall(__NR_io_destroy, ctx));
+}
-	memset(&ctx, 0, sizeof(ctx));
+static void run(void)
+{
    TST_EXP_FAIL(tst_syscall(__NR_io_cancel, ctx, NULL, NULL), EFAULT);
 }
@@ -31,5 +41,7 @@ static struct tst_test test = {
    	"CONFIG_AIO=y",
    	NULL
    },
+	.setup = setup,
+	.cleanup = cleanup,
    .test_all = run,
 };
diff --git a/testcases/kernel/syscalls/io_cancel/io_cancel02.c b/testcases/kernel/syscalls/io_cancel/io_cancel02.c
index 92ec65119202..bbbfbfe3c1ff 100644
--- a/testcases/kernel/syscalls/io_cancel/io_cancel02.c
+++ b/testcases/kernel/syscalls/io_cancel/io_cancel02.c
@@ -20,11 +20,21 @@
#include <libaio.h>
-static void run(void)
+static io_context_t ctx;
+
+static void setup(void)
+{
+	TST_EXP_PASS_SILENT(io_setup(1, &ctx));
+}
+
+static void cleanup(void)
 {
-	io_context_t ctx;
+	if (ctx)
+		TST_EXP_PASS_SILENT(io_destroy(ctx));
+}
-	memset(&ctx, 0, sizeof(ctx));
+static void run(void)
+{
    TEST(io_cancel(ctx, NULL, NULL));
if (TST_RET == 0) {
@@ -46,6 +56,8 @@ static struct tst_test test = {
    	"CONFIG_AIO=y",
    	NULL
    },
+	.setup = setup,
+	.cleanup = cleanup,
    .test_all = run,
 };
-- 
2.34.1


    