diff options
| author | Kees Cook <keescook@chromium.org> | 2020-11-20 22:39:39 +0300 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2020-11-20 22:39:39 +0300 |
| commit | 7ef95e3dbcee74caa303fe4b23c451ae4462f609 (patch) | |
| tree | 619b7f4bf2e7f3d1ccf2ddf2cf62264c9c1ca570 /tools/testing/selftests/seccomp | |
| parent | fab686eb0307121e7a2890b6d6c57edd2457863d (diff) | |
| parent | 4c222f31fb1db4d590503a181a6268ced9252379 (diff) | |
| download | linux-7ef95e3dbcee74caa303fe4b23c451ae4462f609.tar.xz | |
Merge branch 'for-linus/seccomp' into for-next/seccomp
Diffstat (limited to 'tools/testing/selftests/seccomp')
| -rw-r--r-- | tools/testing/selftests/seccomp/seccomp_bpf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 4a180439ee9e..26c72f2b61b1 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -1758,10 +1758,10 @@ TEST_F(TRACE_poke, getpid_runs_normally) * and the code is stored as a positive value. \ */ \ if (_result < 0) { \ - SYSCALL_RET(_regs) = -result; \ + SYSCALL_RET(_regs) = -_result; \ (_regs).ccr |= 0x10000000; \ } else { \ - SYSCALL_RET(_regs) = result; \ + SYSCALL_RET(_regs) = _result; \ (_regs).ccr &= ~0x10000000; \ } \ } while (0) @@ -1804,8 +1804,8 @@ TEST_F(TRACE_poke, getpid_runs_normally) #define SYSCALL_RET(_regs) (_regs).a[(_regs).windowbase * 4 + 2] #elif defined(__sh__) # define ARCH_REGS struct pt_regs -# define SYSCALL_NUM(_regs) (_regs).gpr[3] -# define SYSCALL_RET(_regs) (_regs).gpr[0] +# define SYSCALL_NUM(_regs) (_regs).regs[3] +# define SYSCALL_RET(_regs) (_regs).regs[0] #else # error "Do not know how to find your architecture's registers and syscalls" #endif |