Skip to content

Commit b2c7c07

Browse files
FedeDPFedeDP
committed
fix(driver/modern_bpf): fixed exit syscalls tests.
Signed-off-by: Federico Di Pierro <[email protected]>
1 parent 2d8ea49 commit b2c7c07

19 files changed

+86
-86
lines changed

‎test/modern_bpf/test_suites/syscall_exit_suite/chdir_x.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TEST(SyscallExit, chdirX)
1717

1818
const char* new_dir = "mock_dir";
1919
assert_syscall_state(SYSCALL_FAILURE, "chdir", syscall(__NR_chdir, new_dir));
20-
int64_t errno_value = -errno;
20+
int32_t errno_value = -errno;
2121

2222
/*=============================== TRIGGER SYSCALL ===========================*/
2323

@@ -36,8 +36,8 @@ TEST(SyscallExit, chdirX)
3636

3737
/*=============================== ASSERT PARAMETERS ===========================*/
3838

39-
/* Parameter 1: res (type: PT_ERRNO)*/
40-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
39+
/* Parameter 1: res (type: PT_ERRNO32)*/
40+
evt_test->assert_numeric_param(1, errno_value);
4141

4242
/* Parameter 2: path (type: PT_CHARBUF) */
4343
evt_test->assert_charbuf_param(2, new_dir);

‎test/modern_bpf/test_suites/syscall_exit_suite/chmod_x.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST(SyscallExit, chmodX)
1212
const char* filename = "*//null";
1313
uint32_t mode = S_IXUSR;
1414
assert_syscall_state(SYSCALL_FAILURE, "chmod", syscall(__NR_chmod, filename, mode));
15-
int64_t errno_value = -errno;
15+
int32_t errno_value = -errno;
1616

1717
/*=============================== TRIGGER SYSCALL ===========================*/
1818

@@ -31,7 +31,7 @@ TEST(SyscallExit, chmodX)
3131

3232
/*=============================== ASSERT PARAMETERS ===========================*/
3333

34-
/* Parameter 1: res (type: PT_ERRNO) */
34+
/* Parameter 1: res (type: PT_ERRNO32) */
3535
evt_test->assert_numeric_param(1, errno_value);
3636

3737
/* Parameter 2: filename (type: PT_FSPATH) */

‎test/modern_bpf/test_suites/syscall_exit_suite/chroot_x.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST(SyscallExit, chrootX)
1212

1313
const char* path = "*//null";
1414
assert_syscall_state(SYSCALL_FAILURE, "chroot", syscall(__NR_chroot, path));
15-
int64_t errno_value = -errno;
15+
int32_t errno_value = -errno;
1616

1717
/*=============================== TRIGGER SYSCALL ===========================*/
1818

@@ -31,8 +31,8 @@ TEST(SyscallExit, chrootX)
3131

3232
/*=============================== ASSERT PARAMETERS ===========================*/
3333

34-
/* Parameter 1: res (type: PT_ERRNO)*/
35-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
34+
/* Parameter 1: res (type: PT_ERRNO32)*/
35+
evt_test->assert_numeric_param(1, errno_value);
3636

3737
/* Parameter 2: path (type: PT_FSPATH) */
3838
evt_test->assert_charbuf_param(2, path);

‎test/modern_bpf/test_suites/syscall_exit_suite/close_x.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TEST(SyscallExit, closeX)
1111

1212
int invalid_fd = -1;
1313
assert_syscall_state(SYSCALL_FAILURE, "close", syscall(__NR_close, invalid_fd));
14-
int64_t errno_value = -errno;
14+
int32_t errno_value = -errno;
1515

1616
/*=============================== TRIGGER SYSCALL ===========================*/
1717

@@ -30,7 +30,7 @@ TEST(SyscallExit, closeX)
3030

3131
/*=============================== ASSERT PARAMETERS ===========================*/
3232

33-
/* Parameter 1: ret (type: PT_ERRNO)*/
33+
/* Parameter 1: ret (type: PT_ERRNO32)*/
3434
evt_test->assert_numeric_param(1, errno_value);
3535

3636
/*=============================== ASSERT PARAMETERS ===========================*/

‎test/modern_bpf/test_suites/syscall_exit_suite/copy_file_range_x.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ TEST(SyscallExit, copy_file_rangeX)
1616
size_t len = 20;
1717
uint32_t flags = 0;
1818
assert_syscall_state(SYSCALL_FAILURE, "copy_file_range", syscall(__NR_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags));
19-
int64_t errno_value = -errno;
19+
int32_t errno_value = -errno;
2020

2121
/*=============================== TRIGGER SYSCALL ===========================*/
2222

@@ -35,11 +35,11 @@ TEST(SyscallExit, copy_file_rangeX)
3535

3636
/*=============================== ASSERT PARAMETERS ===========================*/
3737

38-
/* Parameter 1: res (type: PT_FD) */
39-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
38+
/* Parameter 1: res (type: PT_FD32) */
39+
evt_test->assert_numeric_param(1, errno_value);
4040

41-
/* Parameter 2: fdout (type: PT_FD) */
42-
evt_test->assert_numeric_param(2, (int64_t)fd_out);
41+
/* Parameter 2: fdout (type: PT_FD32) */
42+
evt_test->assert_numeric_param(2, fd_out);
4343

4444
/* Parameter 3: offout (type: PT_UINT64) */
4545
evt_test->assert_numeric_param(3, (uint64_t)off_out);

‎test/modern_bpf/test_suites/syscall_exit_suite/creat_x.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ TEST(SyscallExit, creatX_success)
4343

4444
/*=============================== ASSERT PARAMETERS ===========================*/
4545

46-
/* Parameter 1: fd (type: PT_FD) */
47-
evt_test->assert_numeric_param(1, (int64_t)fd);
46+
/* Parameter 1: fd (type: PT_FD32) */
47+
evt_test->assert_numeric_param(1, fd);
4848

4949
/* Parameter 2: name (type: PT_FSPATH) */
5050
evt_test->assert_charbuf_param(2, path);
@@ -75,7 +75,7 @@ TEST(SyscallExit, creatX_failure)
7575
const char* path = "*//null";
7676
mode_t mode = S_IRGRP;
7777
assert_syscall_state(SYSCALL_FAILURE, "creat", syscall(__NR_creat, path, mode));
78-
int64_t errno_value = -errno;
78+
int32_t errno_value = -errno;
7979

8080
/*=============================== TRIGGER SYSCALL ===========================*/
8181

@@ -94,8 +94,8 @@ TEST(SyscallExit, creatX_failure)
9494

9595
/*=============================== ASSERT PARAMETERS ===========================*/
9696

97-
/* Parameter 1: fd (type: PT_FD) */
98-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
97+
/* Parameter 1: fd (type: PT_FD32) */
98+
evt_test->assert_numeric_param(1, errno_value);
9999

100100
/* Parameter 2: name (type: PT_FSPATH) */
101101
evt_test->assert_charbuf_param(2, path);

‎test/modern_bpf/test_suites/syscall_exit_suite/dup2_x.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ TEST(SyscallExit, dup2X)
3737

3838
/*=============================== ASSERT PARAMETERS ===========================*/
3939

40-
/* Parameter 1: res (type: PT_FD) */
41-
evt_test->assert_numeric_param(1, (int64_t)res);
40+
/* Parameter 1: res (type: PT_FD32) */
41+
evt_test->assert_numeric_param(1, res);
4242

43-
/* Parameter 2: oldfd (type: PT_FD) */
44-
evt_test->assert_numeric_param(2, (int64_t)old_fd);
43+
/* Parameter 2: oldfd (type: PT_FD32) */
44+
evt_test->assert_numeric_param(2, old_fd);
4545

46-
/* Parameter 3: newfd (type: PT_FD) */
47-
evt_test->assert_numeric_param(3, (int64_t)new_fd);
46+
/* Parameter 3: newfd (type: PT_FD32) */
47+
evt_test->assert_numeric_param(3, new_fd);
4848

4949
/*=============================== ASSERT PARAMETERS ===========================*/
5050

‎test/modern_bpf/test_suites/syscall_exit_suite/dup3_x.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TEST(SyscallExit, dup3X)
1717
uint32_t flags = O_CLOEXEC;
1818
int32_t res = syscall(__NR_dup3, old_fd, new_fd, flags);
1919
assert_syscall_state(SYSCALL_FAILURE, "dup3", res);
20-
int64_t errno_value = -errno;
20+
int32_t errno_value = -errno;
2121

2222
syscall(__NR_close, old_fd);
2323
syscall(__NR_close, new_fd);
@@ -40,14 +40,14 @@ TEST(SyscallExit, dup3X)
4040

4141
/*=============================== ASSERT PARAMETERS ===========================*/
4242

43-
/* Parameter 1: res (type: PT_FD) */
44-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
43+
/* Parameter 1: res (type: PT_FD32) */
44+
evt_test->assert_numeric_param(1, errno_value);
4545

46-
/* Parameter 2: oldfd (type: PT_FD) */
47-
evt_test->assert_numeric_param(2, (int64_t)old_fd);
46+
/* Parameter 2: oldfd (type: PT_FD32) */
47+
evt_test->assert_numeric_param(2, old_fd);
4848

49-
/* Parameter 3: newfd (type: PT_FD) */
50-
evt_test->assert_numeric_param(3, (int64_t)new_fd);
49+
/* Parameter 3: newfd (type: PT_FD32) */
50+
evt_test->assert_numeric_param(3, new_fd);
5151

5252
/* Parameter 4: flags (type: PT_FLAGS32) */
5353
evt_test->assert_numeric_param(4, (uint32_t)PPM_O_CLOEXEC);

‎test/modern_bpf/test_suites/syscall_exit_suite/dup_x.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ TEST(SyscallExit, dupX)
3535

3636
/*=============================== ASSERT PARAMETERS ===========================*/
3737

38-
/* Parameter 1: res (type: PT_FD) */
39-
evt_test->assert_numeric_param(1, (int64_t)new_fd);
38+
/* Parameter 1: res (type: PT_FD32) */
39+
evt_test->assert_numeric_param(1, new_fd);
4040

41-
/* Parameter 2: oldfd (type: PT_FD) */
42-
evt_test->assert_numeric_param(2, (int64_t)old_fd);
41+
/* Parameter 2: oldfd (type: PT_FD32) */
42+
evt_test->assert_numeric_param(2, old_fd);
4343

4444
/*=============================== ASSERT PARAMETERS ===========================*/
4545

‎test/modern_bpf/test_suites/syscall_exit_suite/fchdir_x.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TEST(SyscallExit, fchdirX)
1111

1212
int invalid_fd = -1;
1313
assert_syscall_state(SYSCALL_FAILURE, "fchdir", syscall(__NR_fchdir, invalid_fd));
14-
int64_t errno_value = -errno;
14+
int32_t errno_value = -errno;
1515

1616
/*=============================== TRIGGER SYSCALL ===========================*/
1717

@@ -30,7 +30,7 @@ TEST(SyscallExit, fchdirX)
3030

3131
/*=============================== ASSERT PARAMETERS ===========================*/
3232

33-
/* Parameter 1: res (type: PT_ERRNO)*/
33+
/* Parameter 1: res (type: PT_ERRNO32)*/
3434
evt_test->assert_numeric_param(1, errno_value);
3535

3636
/*=============================== ASSERT PARAMETERS ===========================*/

‎test/modern_bpf/test_suites/syscall_exit_suite/fchmod_x.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST(SyscallExit, fchmodX)
1212
int32_t mock_fd = -1;
1313
uint32_t mode = S_IXUSR;
1414
assert_syscall_state(SYSCALL_FAILURE, "fchmod", syscall(__NR_fchmod, mock_fd, mode));
15-
int64_t errno_value = -errno;
15+
int32_t errno_value = -errno;
1616

1717
/*=============================== TRIGGER SYSCALL ===========================*/
1818

@@ -31,11 +31,11 @@ TEST(SyscallExit, fchmodX)
3131

3232
/*=============================== ASSERT PARAMETERS ===========================*/
3333

34-
/* Parameter 1: res (type: PT_ERRNO) */
35-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
34+
/* Parameter 1: res (type: PT_ERRNO32) */
35+
evt_test->assert_numeric_param(1, errno_value);
3636

37-
/* Parameter 2: fd (type: PT_FD) */
38-
evt_test->assert_numeric_param(2, (int64_t)mock_fd);
37+
/* Parameter 2: fd (type: PT_FD32) */
38+
evt_test->assert_numeric_param(2, mock_fd);
3939

4040
/* Parameter 3: mode (type: PT_MODE) */
4141
evt_test->assert_numeric_param(3, (uint32_t)PPM_S_IXUSR);

‎test/modern_bpf/test_suites/syscall_exit_suite/fchmodat_x.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TEST(SyscallExit, fchmodatX)
1414
uint32_t mode = S_IXUSR;
1515
uint32_t flags = 0;
1616
assert_syscall_state(SYSCALL_FAILURE, "fchmodat", syscall(__NR_fchmodat, mock_dirfd, pathname, mode, flags));
17-
int64_t errno_value = -errno;
17+
int32_t errno_value = -errno;
1818

1919
/*=============================== TRIGGER SYSCALL ===========================*/
2020

@@ -33,11 +33,11 @@ TEST(SyscallExit, fchmodatX)
3333

3434
/*=============================== ASSERT PARAMETERS ===========================*/
3535

36-
/* Parameter 1: res (type: PT_ERRNO) */
37-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
36+
/* Parameter 1: res (type: PT_ERRNO32) */
37+
evt_test->assert_numeric_param(1, errno_value);
3838

39-
/* Parameter 2: dirfd (type: PT_FD) */
40-
evt_test->assert_numeric_param(2, (int64_t)mock_dirfd);
39+
/* Parameter 2: dirfd (type: PT_FD32) */
40+
evt_test->assert_numeric_param(2, mock_dirfd);
4141

4242
/* Parameter 3: filename (type: PT_FSPATH) */
4343
evt_test->assert_charbuf_param(3, pathname);

‎test/modern_bpf/test_suites/syscall_exit_suite/mkdir_x.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST(SyscallExit, mkdirX)
1212
uint32_t mode = 7;
1313
const char* path = "*//null";
1414
assert_syscall_state(SYSCALL_FAILURE, "mkdir", syscall(__NR_mkdir, path, mode));
15-
int64_t errno_value = -errno;
15+
int32_t errno_value = -errno;
1616

1717
/*=============================== TRIGGER SYSCALL ===========================*/
1818

@@ -31,7 +31,7 @@ TEST(SyscallExit, mkdirX)
3131

3232
/*=============================== ASSERT PARAMETERS ===========================*/
3333

34-
/* Parameter 1: res (type: PT_ERRNO)*/
34+
/* Parameter 1: res (type: PT_ERRNO32)*/
3535
evt_test->assert_numeric_param(1, errno_value);
3636

3737
/* Parameter 2: path (type: PT_FSPATH) */

‎test/modern_bpf/test_suites/syscall_exit_suite/mkdirat_x.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEST(SyscallExit, mkdiratX)
1313
const char* path = "/invalid/path";
1414
uint32_t mode = 8;
1515
assert_syscall_state(SYSCALL_FAILURE, "mkdirat", syscall(__NR_mkdirat, mock_dirfd, path, mode));
16-
int64_t errno_value = -errno;
16+
int32_t errno_value = -errno;
1717

1818
/*=============================== TRIGGER SYSCALL ===========================*/
1919

@@ -32,11 +32,11 @@ TEST(SyscallExit, mkdiratX)
3232

3333
/*=============================== ASSERT PARAMETERS ===========================*/
3434

35-
/* Parameter 1: res (type: PT_ERRNO) */
36-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
35+
/* Parameter 1: res (type: PT_ERRNO32) */
36+
evt_test->assert_numeric_param(1, errno_value);
3737

38-
/* Parameter 2: dirfd (type: PT_FD) */
39-
evt_test->assert_numeric_param(2, (int64_t)mock_dirfd);
38+
/* Parameter 2: dirfd (type: PT_FD32) */
39+
evt_test->assert_numeric_param(2, mock_dirfd);
4040

4141
/* Parameter 3: path (type: PT_FSRELPATH) */
4242
evt_test->assert_charbuf_param(3, path);

‎test/modern_bpf/test_suites/syscall_exit_suite/open_by_handle_at_x.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ TEST(SyscallExit, open_by_handle_atX_success)
143143

144144
/*=============================== ASSERT PARAMETERS ===========================*/
145145

146-
/* Parameter 1: ret (type: PT_FD) */
147-
evt_test->assert_numeric_param(1, (int64_t)open_by_handle_fd);
146+
/* Parameter 1: ret (type: PT_FD32) */
147+
evt_test->assert_numeric_param(1, open_by_handle_fd);
148148

149-
/* Parameter 2: mountfd (type: PT_FD) */
150-
evt_test->assert_numeric_param(2, (int64_t)dirfd);
149+
/* Parameter 2: mountfd (type: PT_FD32) */
150+
evt_test->assert_numeric_param(2, dirfd);
151151

152152
/* Parameter 3: flags (type: PT_FLAGS32) */
153153
evt_test->assert_numeric_param(3, (uint32_t)PPM_O_RDONLY);

‎test/modern_bpf/test_suites/syscall_exit_suite/open_x.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ TEST(SyscallExit, openX_success)
4545

4646
/*=============================== ASSERT PARAMETERS ===========================*/
4747

48-
/* Parameter 1: ret (type: PT_FD)*/
49-
evt_test->assert_numeric_param(1, (int64_t)fd);
48+
/* Parameter 1: ret (type: PT_FD32)*/
49+
evt_test->assert_numeric_param(1, fd);
5050

5151
/* Parameter 2: name (type: PT_FSPATH) */
5252
evt_test->assert_charbuf_param(2, pathname);
@@ -85,7 +85,7 @@ TEST(SyscallExit, openX_failure)
8585
int flags = O_RDWR | O_TMPFILE | O_DIRECTORY;
8686
mode_t mode = 0;
8787
assert_syscall_state(SYSCALL_FAILURE, "open", syscall(__NR_open, pathname, flags, mode));
88-
int64_t errno_value = -errno;
88+
int32_t errno_value = -errno;
8989

9090
/*=============================== TRIGGER SYSCALL ===========================*/
9191

@@ -104,8 +104,8 @@ TEST(SyscallExit, openX_failure)
104104

105105
/*=============================== ASSERT PARAMETERS ===========================*/
106106

107-
/* Parameter 1: ret (type: PT_FD)*/
108-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
107+
/* Parameter 1: ret (type: PT_FD32)*/
108+
evt_test->assert_numeric_param(1, errno_value);
109109

110110
/* Parameter 2: name (type: PT_FSPATH) */
111111
evt_test->assert_charbuf_param(2, pathname);

‎test/modern_bpf/test_suites/syscall_exit_suite/openat2_x.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ TEST(SyscallExit, openat2X_success)
4242

4343
/*=============================== ASSERT PARAMETERS ===========================*/
4444

45-
/* Parameter 1: fd (type: PT_FD) */
46-
evt_test->assert_numeric_param(1, (int64_t)fd);
45+
/* Parameter 1: fd (type: PT_FD32) */
46+
evt_test->assert_numeric_param(1, fd);
4747

48-
/* Parameter 2: dirfd (type: PT_FD) */
49-
evt_test->assert_numeric_param(2, (int64_t)PPM_AT_FDCWD);
48+
/* Parameter 2: dirfd (type: PT_FD32) */
49+
evt_test->assert_numeric_param(2, PPM_AT_FDCWD);
5050

5151
/* Parameter 3: name (type: PT_FSPATH) */
5252
evt_test->assert_charbuf_param(3, pathname);
@@ -85,7 +85,7 @@ TEST(SyscallExit, openat2X_failure)
8585
how.mode = 0;
8686
how.resolve = RESOLVE_BENEATH | RESOLVE_NO_MAGICLINKS;
8787
assert_syscall_state(SYSCALL_FAILURE, "openat2", syscall(__NR_openat2, dirfd, pathname, &how, sizeof(struct open_how)));
88-
int64_t errno_value = -errno;
88+
int32_t errno_value = -errno;
8989

9090
/*=============================== TRIGGER SYSCALL ===========================*/
9191

@@ -104,11 +104,11 @@ TEST(SyscallExit, openat2X_failure)
104104

105105
/*=============================== ASSERT PARAMETERS ===========================*/
106106

107-
/* Parameter 1: fd (type: PT_FD) */
108-
evt_test->assert_numeric_param(1, (int64_t)errno_value);
107+
/* Parameter 1: fd (type: PT_FD32) */
108+
evt_test->assert_numeric_param(1, errno_value);
109109

110-
/* Parameter 2: dirfd (type: PT_FD) */
111-
evt_test->assert_numeric_param(2, (int64_t)PPM_AT_FDCWD);
110+
/* Parameter 2: dirfd (type: PT_FD32) */
111+
evt_test->assert_numeric_param(2, PPM_AT_FDCWD);
112112

113113
/* Parameter 3: name (type: PT_FSPATH) */
114114
evt_test->assert_charbuf_param(3, pathname);

0 commit comments

Comments
 (0)