All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Schmitz <schmitzmic@gmail.com>
To: linux-m68k@vger.kernel.org, geert@linux-m68k.org
Cc: glaubitz@physik.fu-berlin.de, Michael Schmitz <schmitzmic@gmail.com>
Subject: [PATCH v13 3/3] tools/testing - seccomp test fixes for m68k
Date: Thu, 12 Jan 2023 16:55:29 +1300	[thread overview]
Message-ID: <20230112035529.13521-4-schmitzmic@gmail.com> (raw)
In-Reply-To: <20230112035529.13521-1-schmitzmic@gmail.com>

Add m68k seccomp definitions to seccomp_bpf self test code.

Tested on ARAnyM.

Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>

--
Changes from v12:

Michael Karcher:
- use correct definition of ARCH_REGS (use of struct pt_regs
  cause stack overflow on passing register set to user space
  due to size mismatch, and has some register offsets wrong)
---
 tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 9c2f448bb3a9..e222dc113c4b 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -138,6 +138,8 @@ struct seccomp_data {
 #  define __NR_seccomp 337
 # elif defined(__sh__)
 #  define __NR_seccomp 372
+# elif defined(__mc68000__)
+#  define __NR_seccomp 380
 # else
 #  warning "seccomp syscall number unknown for this architecture"
 #  define __NR_seccomp 0xffff
@@ -1838,6 +1840,10 @@ TEST_F(TRACE_poke, getpid_runs_normally)
 # define ARCH_REGS		struct pt_regs
 # define SYSCALL_NUM(_regs)	(_regs).regs[3]
 # define SYSCALL_RET(_regs)	(_regs).regs[0]
+#elif defined(__mc68000__)
+# define ARCH_REGS	struct user_regs_struct
+# define SYSCALL_NUM(_regs)	(_regs).orig_d0
+# define SYSCALL_RET(_regs)	(_regs).d0
 #else
 # error "Do not know how to find your architecture's registers and syscalls"
 #endif
@@ -1902,7 +1908,7 @@ const bool ptrace_entry_set_syscall_ret =
  * Use PTRACE_GETREGS and PTRACE_SETREGS when available. This is useful for
  * architectures without HAVE_ARCH_TRACEHOOK (e.g. User-mode Linux).
  */
-#if defined(__x86_64__) || defined(__i386__) || defined(__mips__)
+#if defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__mc68000__)
 # define ARCH_GETREGS(_regs)	ptrace(PTRACE_GETREGS, tracee, 0, &(_regs))
 # define ARCH_SETREGS(_regs)	ptrace(PTRACE_SETREGS, tracee, 0, &(_regs))
 #else
-- 
2.17.1


  parent reply	other threads:[~2023-01-12  3:55 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-12  3:55 [PATCH v13 0/3] Add kernel seccomp support for m68k Michael Schmitz
2023-01-12  3:55 ` [PATCH v13 1/3] m68k/kernel - check syscall_trace_enter() return code on m68k Michael Schmitz
2023-01-22 16:35   ` Geert Uytterhoeven
2023-01-22 16:35     ` Geert Uytterhoeven
2023-01-12  3:55 ` [PATCH v13 2/3] m68k: add kernel seccomp support Michael Schmitz
2023-01-22 16:37   ` Geert Uytterhoeven
2023-01-22 16:40     ` John Paul Adrian Glaubitz
2023-01-22 18:11     ` Michael Schmitz
2023-01-22 18:49       ` Geert Uytterhoeven
2023-01-12  3:55 ` Michael Schmitz [this message]
2023-01-22 16:40   ` [PATCH v13 3/3] tools/testing - seccomp test fixes for m68k Geert Uytterhoeven
2023-01-12  6:42 ` [PATCH v13 0/3] Add kernel seccomp support " Michael Schmitz
2023-01-13 17:29 ` John Paul Adrian Glaubitz
2023-01-14  0:00   ` Michael Schmitz
2023-01-16  9:12     ` John Paul Adrian Glaubitz
2023-01-17  2:15       ` Michael Schmitz
2023-01-17  8:08         ` John Paul Adrian Glaubitz
2023-01-17 23:25           ` Michael Schmitz
2023-01-18  8:30             ` John Paul Adrian Glaubitz
2023-01-18  9:43               ` John Paul Adrian Glaubitz
2023-01-18 22:21                 ` Michael Schmitz
2023-01-19  9:18                   ` John Paul Adrian Glaubitz
2023-01-20 10:45                     ` John Paul Adrian Glaubitz
2023-02-27 20:45 ` Kees Cook
2023-03-07  2:57   ` Michael Schmitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230112035529.13521-4-schmitzmic@gmail.com \
    --to=schmitzmic@gmail.com \
    --cc=geert@linux-m68k.org \
    --cc=glaubitz@physik.fu-berlin.de \
    --cc=linux-m68k@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.