diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2022-01-12 14:46:56 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2022-01-13 17:03:14 +0100 |
| commit | a7cd45867795d470cbc688d8485f2b5c1eb986fc (patch) | |
| tree | 090b128f9b60eaff7ffd352f1c03c18839d07d8b | |
| parent | 5060bda66fc0ed04a6db9db7bc382bdccb1615de (diff) | |
executor: remove custom sys_io_uring_setup definition
| -rw-r--r-- | executor/common_linux.h | 8 | ||||
| -rw-r--r-- | pkg/csource/generated.go | 8 | ||||
| -rw-r--r-- | sys/targets/targets.go | 1 |
3 files changed, 3 insertions, 14 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 6353d71f7..479c229dc 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -1767,12 +1767,6 @@ struct io_uring_params { #include <sys/mman.h> #include <unistd.h> -#if GOARCH_mips64le -#define sys_io_uring_setup 5425 -#else -#define sys_io_uring_setup 425 -#endif - // Wrapper for io_uring_setup and the subsequent mmap calls that map the ring and the sqes static long syz_io_uring_setup(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5) { @@ -1787,7 +1781,7 @@ static long syz_io_uring_setup(volatile long a0, volatile long a1, volatile long void** ring_ptr_out = (void**)a4; void** sqes_ptr_out = (void**)a5; - uint32 fd_io_uring = syscall(sys_io_uring_setup, entries, setup_params); + uint32 fd_io_uring = syscall(__NR_io_uring_setup, entries, setup_params); // Compute the ring sizes uint32 sq_ring_sz = setup_params->sq_off.array + setup_params->sq_entries * sizeof(uint32); diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 522317e0f..7c3b35ca5 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -3908,12 +3908,6 @@ struct io_uring_params { #include <sys/mman.h> #include <unistd.h> - -#if GOARCH_mips64le -#define sys_io_uring_setup 5425 -#else -#define sys_io_uring_setup 425 -#endif static long syz_io_uring_setup(volatile long a0, volatile long a1, volatile long a2, volatile long a3, volatile long a4, volatile long a5) { uint32 entries = (uint32)a0; @@ -3923,7 +3917,7 @@ static long syz_io_uring_setup(volatile long a0, volatile long a1, volatile long void** ring_ptr_out = (void**)a4; void** sqes_ptr_out = (void**)a5; - uint32 fd_io_uring = syscall(sys_io_uring_setup, entries, setup_params); + uint32 fd_io_uring = syscall(__NR_io_uring_setup, entries, setup_params); uint32 sq_ring_sz = setup_params->sq_off.array + setup_params->sq_entries * sizeof(uint32); uint32 cq_ring_sz = setup_params->cq_off.cqes + setup_params->cq_entries * SIZEOF_IO_URING_CQE; uint32 ring_sz = sq_ring_sz > cq_ring_sz ? sq_ring_sz : cq_ring_sz; diff --git a/sys/targets/targets.go b/sys/targets/targets.go index a803cc31b..a975ad27a 100644 --- a/sys/targets/targets.go +++ b/sys/targets/targets.go @@ -460,6 +460,7 @@ var oses = map[string]osCommon{ PseudoSyscallDeps: map[string][]string{ "syz_read_part_table": []string{"memfd_create"}, "syz_mount_image": []string{"memfd_create"}, + "syz_io_uring_setup": []string{"io_uring_setup"}, }, cflags: []string{"-static-pie"}, }, |