Re: [PATCH 06/15] selftests/seccomp: mips: Remove O32-specific macro

[Christian Brauner]

On Sat, Sep 12, 2020 at 04:08:11AM -0700, Kees Cook wrote:
> Instead of having the mips O32 macro special-cased, pull the logic into
> the SYSCALL_NUM() macro. Additionally include the ABI headers, since
> these appear to have been missing, leaving __NR_O32_Linux undefined.
> 
> Signed-off-by: Kees Cook 
> ---

Looks good!
Acked-by: Christian Brauner 

[PATCH 06/15] selftests/seccomp: mips: Remove O32-specific macro

[Kees Cook]

Instead of having the mips O32 macro special-cased, pull the logic into
the SYSCALL_NUM() macro. Additionally include the ABI headers, since
these appear to have been missing, leaving __NR_O32_Linux undefined.

Signed-off-by: Kees Cook 
---
 tools/testing/selftests/seccomp/seccomp_bpf.c | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c 
b/tools/testing/selftests/seccomp/seccomp_bpf.c
index cfa606d96086..aa1c224371d1 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -1756,9 +1756,19 @@ TEST_F(TRACE_poke, getpid_runs_normally)
 # define SYSCALL_RET(_regs)(_regs).gprs[2]
 # define SYSCALL_NUM_RET_SHARE_REG
 #elif defined(__mips__)
+# include 
+# include 
+# include 
 # define ARCH_REGS struct pt_regs
-# define SYSCALL_NUM(_regs)(_regs).regs[2]
-# define SYSCALL_SYSCALL_NUM   regs[4]
+# define SYSCALL_NUM(_regs)\
+   ({  \
+   typeof((_regs).regs[2]) _nr;\
+   if ((_regs).regs[2] == __NR_O32_Linux)  \
+   _nr = (_regs).regs[4];  \
+   else\
+   _nr = (_regs).regs[2];  \
+   _nr;\
+   })
 # define SYSCALL_NUM_SET(_regs, _nr)   \
do {\
if ((_regs).regs[2] == __NR_O32_Linux)  \
@@ -1838,10 +1848,6 @@ int get_syscall(struct __test_metadata *_metadata, pid_t 
tracee)
}
 #endif
 
-#if defined(__mips__)
-   if (SYSCALL_NUM(regs) == __NR_O32_Linux)
-   return regs.SYSCALL_SYSCALL_NUM;
-#endif
return SYSCALL_NUM(regs);
 }
 
-- 
2.25.1