lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 172/252] selftests/seccomp: sh: Fix register names
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit 4c222f31fb1db4d590503a181a6268ced9252379 ]

    It looks like the seccomp selftests was never actually built for sh.
    This fixes it, though I don't have an environment to do a runtime test
    of it yet.

    Fixes: 0bb605c2c7f2b4b3 ("sh: Add SECCOMP_FILTER")
    Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
    Link: https://lore.kernel.org/lkml/a36d7b48-6598-1642-e403-0c77a86f416d@physik.fu-berlin.de
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/seccomp/seccomp_bpf.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
    index 6a27b12e9b3c2..687ca8afe0e83 100644
    --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
    +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
    @@ -1738,8 +1738,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
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-23 13:56    [W:3.857 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site