From ee3660f91879eb82eb1885a9a5688fec245dcfbf Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Mon, 1 Nov 2021 10:07:24 -0600 Subject: tests: add the mipsel and sh ABIs to test 30-sim-socket_syscalls Signed-off-by: Paul Moore Reviewed-by: Tom Hromatka Signed-off-by: Tom Hromatka --- tests/30-sim-socket_syscalls.c | 6 ++++ tests/30-sim-socket_syscalls.py | 18 ++++++++++++ tests/30-sim-socket_syscalls.tests | 57 +++++++++++++++++++++++--------------- 3 files changed, 58 insertions(+), 23 deletions(-) diff --git a/tests/30-sim-socket_syscalls.c b/tests/30-sim-socket_syscalls.c index 900f0a3..21ea631 100644 --- a/tests/30-sim-socket_syscalls.c +++ b/tests/30-sim-socket_syscalls.c @@ -54,6 +54,12 @@ int main(int argc, char *argv[]) if (rc != 0) goto out; rc = seccomp_arch_add(ctx, SCMP_ARCH_PPC64LE); + if (rc != 0) + goto out; + rc = seccomp_arch_add(ctx, SCMP_ARCH_MIPSEL); + if (rc != 0) + goto out; + rc = seccomp_arch_add(ctx, SCMP_ARCH_SH); if (rc != 0) goto out; diff --git a/tests/30-sim-socket_syscalls.py b/tests/30-sim-socket_syscalls.py index d37d411..16ba357 100755 --- a/tests/30-sim-socket_syscalls.py +++ b/tests/30-sim-socket_syscalls.py @@ -35,11 +35,29 @@ def test(args): f.add_arch(Arch("x86_64")) f.add_arch(Arch("x32")) f.add_arch(Arch("ppc64le")) + f.add_arch(Arch("mipsel")) + f.add_arch(Arch("sh")) f.add_rule(ALLOW, "socket") + f.add_rule(ALLOW, "bind") f.add_rule(ALLOW, "connect") + f.add_rule(ALLOW, "listen") f.add_rule(ALLOW, "accept") f.add_rule(ALLOW, "accept4") + f.add_rule(ALLOW, "getsockname") + f.add_rule(ALLOW, "getpeername") + f.add_rule(ALLOW, "socketpair") + f.add_rule(ALLOW, "send") + f.add_rule(ALLOW, "recv") + f.add_rule(ALLOW, "sendto") + f.add_rule(ALLOW, "recvfrom") f.add_rule(ALLOW, "shutdown") + f.add_rule(ALLOW, "setsockopt") + f.add_rule(ALLOW, "getsockopt") + f.add_rule(ALLOW, "sendmsg") + f.add_rule(ALLOW, "recvmsg") + f.add_rule(ALLOW, "accept4") + f.add_rule(ALLOW, "sendmmsg") + f.add_rule(ALLOW, "recvmmsg") return f args = util.get_opt() diff --git a/tests/30-sim-socket_syscalls.tests b/tests/30-sim-socket_syscalls.tests index b439c18..be499a5 100644 --- a/tests/30-sim-socket_syscalls.tests +++ b/tests/30-sim-socket_syscalls.tests @@ -7,39 +7,50 @@ test type: bpf-sim -# Testname Arch Syscall Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Result +# Testname Arch Syscall Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Result # socket -30-sim-socket_syscalls +x86,+ppc64le socketcall 1 N N N N N ALLOW +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh socketcall 1 N N N N N ALLOW # connect -30-sim-socket_syscalls +x86,+ppc64le socketcall 3 N N N N N ALLOW +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh socketcall 3 N N N N N ALLOW # accept -30-sim-socket_syscalls +x86,+ppc64le socketcall 5 N N N N N ALLOW +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh socketcall 5 N N N N N ALLOW # accept4 -30-sim-socket_syscalls +ppc64le socketcall 18 N N N N N ALLOW +30-sim-socket_syscalls +ppc64le socketcall 18 N N N N N ALLOW # shutdown -30-sim-socket_syscalls +x86,+ppc64le socketcall 13 N N N N N ALLOW +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh socketcall 13 N N N N N ALLOW # socket -30-sim-socket_syscalls +x86 359 0 1 2 N N N ALLOW -30-sim-socket_syscalls +ppc64le 326 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86 359 0 1 2 N N N ALLOW +30-sim-socket_syscalls +ppc64le 326 0 1 2 N N N ALLOW +30-sim-socket_syscalls +mipsel 4183 0 1 2 N N N ALLOW +30-sim-socket_syscalls +sh 340 0 1 2 N N N ALLOW # connect -30-sim-socket_syscalls +x86 362 0 1 2 N N N ALLOW -30-sim-socket_syscalls +ppc64le 328 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86 362 0 1 2 N N N ALLOW +30-sim-socket_syscalls +ppc64le 328 0 1 2 N N N ALLOW +30-sim-socket_syscalls +mipsel 4170 0 1 2 N N N ALLOW +30-sim-socket_syscalls +sh 342 0 1 2 N N N ALLOW # accept -30-sim-socket_syscalls +ppc64le 330 0 1 2 N N N ALLOW +30-sim-socket_syscalls +ppc64le 330 0 1 2 N N N ALLOW +30-sim-socket_syscalls +mipsel 4168 0 1 2 N N N ALLOW +30-sim-socket_syscalls +sh 344 0 1 2 N N N ALLOW # accept4 -30-sim-socket_syscalls +x86 364 0 1 2 N N N ALLOW -30-sim-socket_syscalls +ppc64le 344 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86 364 0 1 2 N N N ALLOW +30-sim-socket_syscalls +ppc64le 344 0 1 2 N N N ALLOW +30-sim-socket_syscalls +mipsel 4334 0 1 2 N N N ALLOW +30-sim-socket_syscalls +sh 358 0 1 2 N N N ALLOW # shutdown -30-sim-socket_syscalls +x86 373 0 1 2 N N N ALLOW -30-sim-socket_syscalls +ppc64le 338 0 1 2 N N N ALLOW -30-sim-socket_syscalls +x86,+ppc64le accept 5 N N N N N ALLOW -30-sim-socket_syscalls +x86,+ppc64le accept 0 1 2 N N N KILL -30-sim-socket_syscalls +x86,+ppc64le accept4 18 1 2 N N N ALLOW -30-sim-socket_syscalls +x86,+ppc64le accept4 0 1 2 N N N KILL -30-sim-socket_syscalls +x86_64 socket 0 1 2 N N N ALLOW -30-sim-socket_syscalls +x86_64 connect 0 1 2 N N N ALLOW -30-sim-socket_syscalls +x86_64 accept4 0 1 2 N N N ALLOW -30-sim-socket_syscalls +x86_64 shutdown 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86 373 0 1 2 N N N ALLOW +30-sim-socket_syscalls +ppc64le 338 0 1 2 N N N ALLOW +30-sim-socket_syscalls +mipsel 4182 0 1 2 N N N ALLOW +30-sim-socket_syscalls +sh 352 0 1 2 N N N ALLOW +# direct syscalls +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh accept 5 N N N N N ALLOW +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh accept 0 1 2 N N N KILL +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh accept4 18 1 2 N N N ALLOW +30-sim-socket_syscalls +x86,+ppc64le,+mipsel,+sh accept4 0 1 2 N N N KILL +30-sim-socket_syscalls +x86_64 socket 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86_64 connect 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86_64 accept4 0 1 2 N N N ALLOW +30-sim-socket_syscalls +x86_64 shutdown 0 1 2 N N N ALLOW test type: bpf-valgrind -- cgit v1.2.1