Skip to content

BUG: check direct syscall before multiplexed pseudo-syscall #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikita-dubrovskii wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −5
Open

BUG: check direct syscall before multiplexed pseudo-syscall #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d470afb
syscalls: check direct syscall before multiplexed pseudo-syscall
nikita-dubrovskii May 18, 2026
4d2fc3d
tests: adjust socket syscall tests for direct syscall resolution
nikita-dubrovskii May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/syscalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
int abi_syscall_resolve_name_munge(const struct arch_def *arch,
const char *name)
{
int sys = __NR_SCMP_ERROR;

/* Check if arch implements syscall directly and return its number */
sys = arch->syscall_resolve_name_raw(name);
if (sys != __NR_SCMP_ERROR) {
return sys;
}

#define _ABI_SYSCALL_RES_NAME_CHK(NAME) \
if (!strcmp(name, #NAME)) return __PNR_##NAME;
Expand Down Expand Up @@ -79,7 +86,7 @@ int abi_syscall_resolve_name_munge(const struct arch_def *arch,
_ABI_SYSCALL_RES_NAME_CHK(shmget)
_ABI_SYSCALL_RES_NAME_CHK(shmctl)

return arch->syscall_resolve_name_raw(name);
return __NR_SCMP_ERROR;
}

/**
Expand Down
5 changes: 3 additions & 2 deletions tests/30-sim-socket_syscalls.tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ test type: bpf-sim
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 accept 0 1 2 N N N KILL
30-sim-socket_syscalls +ppc64le,+mipsel,+sh accept 0 1 2 N N N ALLOW
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,+ppc64le,+mipsel,+sh accept4 0 1 2 N N N ALLOW
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
Expand Down
5 changes: 3 additions & 2 deletions tests/33-sim-socket_syscalls_be.tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ test type: bpf-sim
33-sim-socket_syscalls_be +s390,+s390x 373 0 1 2 N N N ALLOW
33-sim-socket_syscalls_be +ppc 338 0 1 2 N N N ALLOW
33-sim-socket_syscalls_be +s390,+s390x,+ppc accept 5 N N N N N ALLOW
33-sim-socket_syscalls_be +s390,+s390x,+ppc accept 0 1 2 N N N KILL
33-sim-socket_syscalls_be +s390,+s390x accept 0 1 2 N N N KILL
33-sim-socket_syscalls_be +ppc accept 0 1 2 N N N ALLOW
33-sim-socket_syscalls_be +s390,+s390x,+ppc accept4 18 1 2 N N N ALLOW
33-sim-socket_syscalls_be +s390,+s390x,+ppc accept4 0 1 2 N N N KILL
33-sim-socket_syscalls_be +s390,+s390x,+ppc accept4 0 1 2 N N N ALLOW

test type: bpf-valgrind

Expand Down
Loading