tests: fix format warnings on x32

The type of __X32_SYSCALL_BIT changed from int to unsigned long by Linux
kernel commit v5.3-rc1-1-g45e29d119e9923ff14dfb840e3482bef1667bbfb.
Consequently, __NR_* macros are now defined to values of an unsigned long
integer type on x32.

tests/prctl-seccomp-filter-v.c (PRINT_ALLOW_SYSCALL, PRINT_DENY_SYSCALL):
Fix format warning.
tests/seccomp-filter-v.c (PRINT_ALLOW_SYSCALL, PRINT_DENY_SYSCALL):
Likewise.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>

diff --git a/tests/prctl-seccomp-filter-v.c b/tests/prctl-seccomp-filter-v.c
index 6e1affc008f4e731b0c7add338c108660987024d..61e0ae3c556d43d75abe5b071d2d6c55b930f128 100644 (file)
--- a/tests/prctl-seccomp-filter-v.c
+++ b/tests/prctl-seccomp-filter-v.c
@@ -43,14 +43,14 @@
                BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL)
 
 # define PRINT_ALLOW_SYSCALL(nr) \
-       printf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#x, 0, 0x1), " \
+       printf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#lx, 0, 0x1), " \
               "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), ", \
-              __NR_ ## nr)
+              (long) __NR_ ## nr)
 
 # define PRINT_DENY_SYSCALL(nr, err) \
-       printf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#x, 0, 0x1), " \
+       printf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#lx, 0, 0x1), " \
               "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO|%#x), ", \
-              __NR_ ## nr, err)
+              (long) __NR_ ## nr, err)
 
 static const struct sock_filter filter[] = {
        /* load syscall number */

diff --git a/tests/seccomp-filter-v.c b/tests/seccomp-filter-v.c
index f3adce4484fe7b4fb23fce7ed3cbc72231c166e7..f8bd7834c987d10e7c3209f90cb5602055fc28d0 100644 (file)
--- a/tests/seccomp-filter-v.c
+++ b/tests/seccomp-filter-v.c
@@ -43,14 +43,14 @@
                BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL)
 
 # define PRINT_ALLOW_SYSCALL(nr) \
-       tprintf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#x, 0, 0x1), " \
-              "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), ", \
-              __NR_ ## nr)
+       tprintf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#lx, 0, 0x1), " \
+               "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), ", \
+               (long) __NR_ ## nr)
 
 # define PRINT_DENY_SYSCALL(nr, err) \
-       tprintf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#x, 0, 0x1), " \
-              "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO|%#x), ", \
-              __NR_ ## nr, err)
+       tprintf("BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, %#lx, 0, 0x1), " \
+               "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO|%#x), ", \
+               (long) __NR_ ## nr, err)
 
 static const struct sock_filter filter_c[] = {
        /* load syscall number */