Skip to content

Commit

Permalink
tests: only use bogus syscall numbers in test 29
Browse files Browse the repository at this point in the history
The goal of test 29 is to test bogus negative syscall numbers,
unfortunately it appears our choice of syscalls was not bogus on all
the architectures we support.  This commit fixes that by picking a
syscall number well outside the pseudo-syscall/PNR range and removing
the sysmips(2) syscall from the test so as to not cause problems
at a later date.

Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
  • Loading branch information
pcmoore authored and drakenclimber committed Sep 20, 2024
1 parent 2847f10 commit 87876aa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 17 deletions.
11 changes: 2 additions & 9 deletions tests/29-sim-pseudo_syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,8 @@ int main(int argc, char *argv[])
if (rc < 0)
goto out;

/* SCMP_SYS(sysmips) == 4294957190 (unsigned) */
rc = seccomp_rule_add(ctx, SCMP_ACT_KILL, SCMP_SYS(sysmips), 0);
if (rc < 0)
goto out;
rc = seccomp_rule_add_exact(ctx, SCMP_ACT_KILL, SCMP_SYS(sysmips), 0);
if (rc == 0)
goto out;
/* -10001 == 4294957295 (unsigned) */
rc = seccomp_rule_add_exact(ctx, SCMP_ACT_KILL, -10001, 0);
/* -100001 == 4294867295 (unsigned) */
rc = seccomp_rule_add_exact(ctx, SCMP_ACT_KILL, -100001, 0);
if (rc == 0)
goto out;

Expand Down
7 changes: 1 addition & 6 deletions tests/29-sim-pseudo_syscall.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,8 @@ def test(args):
f = SyscallFilter(ALLOW)
f.remove_arch(Arch())
f.add_arch(Arch("x86"))
f.add_rule(KILL, "sysmips")
try:
f.add_rule_exactly(KILL, "sysmips")
except RuntimeError:
pass
try:
f.add_rule_exactly(KILL, -10001)
f.add_rule_exactly(KILL, -100001)
except RuntimeError:
pass
return f
Expand Down
3 changes: 1 addition & 2 deletions tests/29-sim-pseudo_syscall.tests
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ test type: bpf-sim

# Testname Arch Syscall Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Result
29-sim-pseudo_syscall +x86 0-10 N N N N N N ALLOW
29-sim-pseudo_syscall +x86 4294957190 N N N N N N ALLOW
29-sim-pseudo_syscall +x86 4294957295 N N N N N N ALLOW
29-sim-pseudo_syscall +x86 4294867295 N N N N N N ALLOW

test type: bpf-valgrind

Expand Down

0 comments on commit 87876aa

Please sign in to comment.