From: Rich Felker <dalias@libc.org> To: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Yoshinori Sato <ysato@users.sourceforge.jp> Subject: Re: [PATCH 3/4] sh: Add SECCOMP_FILTER Date: Fri, 28 Aug 2020 17:03:00 +0000 [thread overview] Message-ID: <20200828170259.GZ3265@brightrain.aerifal.cx> (raw) In-Reply-To: <82b625c2-23cb-69a4-7495-39427430c306@physik.fu-berlin.de> On Fri, Aug 28, 2020 at 06:38:09PM +0200, John Paul Adrian Glaubitz wrote: > Hi! > > On 8/28/20 6:30 PM, Rich Felker wrote: > > I'm about to test a patch along these lines and will report what I > > find. > > Let me know when you have something to test and I will test the patch as > well, making sure we're not breaking seccomp again. If you have a seccomp test setup, please try the following patch. I'm not sure if the end result is entirely correct, but I believe it's at least much closer to correct than the code was before or after adding SECCOMP_FILTER. diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index ad963104d22d..0560a8054215 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -368,9 +368,6 @@ syscall_trace_entry: mov.l 7f, r11 ! Call do_syscall_trace_enter which notifies jsr @r11 ! superior (will chomp R[0-7]) nop - cmp/eq #-1, r0 - bt syscall_exit - mov.l r0, @(OFF_R0,r15) ! Save return value ! Reload R0-R4 from kernel stack, where the ! parent may have modified them using ! ptrace(POKEUSR). (Note that R0-R2 are @@ -382,7 +379,7 @@ syscall_trace_entry: mov.l @(OFF_R5,r15), r5 mov.l @(OFF_R6,r15), r6 mov.l @(OFF_R7,r15), r7 ! arg3 - mov.l @(OFF_R3,r15), r3 ! syscall_nr + mov r0, r3 ! syscall_nr, possibly changed to -1 ! mov.l 6f, r10 ! Number of syscalls cmp/hs r10, r3 diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c index 25ccfbd02bfa..9e86cff041c7 100644 --- a/arch/sh/kernel/ptrace_32.c +++ b/arch/sh/kernel/ptrace_32.c @@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) audit_syscall_entry(regs->regs[3], regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]); - return ret ?: regs->regs[0]; + return ret ?: regs->regs[3]; } asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)
WARNING: multiple messages have this Message-ID (diff)
From: Rich Felker <dalias@libc.org> To: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Yoshinori Sato <ysato@users.sourceforge.jp> Subject: Re: [PATCH 3/4] sh: Add SECCOMP_FILTER Date: Fri, 28 Aug 2020 13:03:00 -0400 [thread overview] Message-ID: <20200828170259.GZ3265@brightrain.aerifal.cx> (raw) In-Reply-To: <82b625c2-23cb-69a4-7495-39427430c306@physik.fu-berlin.de> On Fri, Aug 28, 2020 at 06:38:09PM +0200, John Paul Adrian Glaubitz wrote: > Hi! > > On 8/28/20 6:30 PM, Rich Felker wrote: > > I'm about to test a patch along these lines and will report what I > > find. > > Let me know when you have something to test and I will test the patch as > well, making sure we're not breaking seccomp again. If you have a seccomp test setup, please try the following patch. I'm not sure if the end result is entirely correct, but I believe it's at least much closer to correct than the code was before or after adding SECCOMP_FILTER. diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index ad963104d22d..0560a8054215 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -368,9 +368,6 @@ syscall_trace_entry: mov.l 7f, r11 ! Call do_syscall_trace_enter which notifies jsr @r11 ! superior (will chomp R[0-7]) nop - cmp/eq #-1, r0 - bt syscall_exit - mov.l r0, @(OFF_R0,r15) ! Save return value ! Reload R0-R4 from kernel stack, where the ! parent may have modified them using ! ptrace(POKEUSR). (Note that R0-R2 are @@ -382,7 +379,7 @@ syscall_trace_entry: mov.l @(OFF_R5,r15), r5 mov.l @(OFF_R6,r15), r6 mov.l @(OFF_R7,r15), r7 ! arg3 - mov.l @(OFF_R3,r15), r3 ! syscall_nr + mov r0, r3 ! syscall_nr, possibly changed to -1 ! mov.l 6f, r10 ! Number of syscalls cmp/hs r10, r3 diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c index 25ccfbd02bfa..9e86cff041c7 100644 --- a/arch/sh/kernel/ptrace_32.c +++ b/arch/sh/kernel/ptrace_32.c @@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) audit_syscall_entry(regs->regs[3], regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]); - return ret ?: regs->regs[0]; + return ret ?: regs->regs[3]; } asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)
next prev parent reply other threads:[~2020-08-28 17:03 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-22 23:13 [PATCH 1/4] sh: Fix validation of system call number Michael Karcher 2020-07-22 23:13 ` Michael Karcher 2020-07-22 23:13 ` [PATCH 2/4] sh: Rearrange blocks in entry-common.S Michael Karcher 2020-07-22 23:13 ` Michael Karcher 2020-07-22 23:20 ` John Paul Adrian Glaubitz 2020-07-22 23:20 ` John Paul Adrian Glaubitz 2020-07-22 23:13 ` [PATCH 3/4] sh: Add SECCOMP_FILTER Michael Karcher 2020-07-22 23:13 ` Michael Karcher 2020-07-22 23:20 ` John Paul Adrian Glaubitz 2020-07-22 23:20 ` John Paul Adrian Glaubitz 2020-08-28 15:50 ` Rich Felker 2020-08-28 15:50 ` Rich Felker 2020-08-28 16:21 ` John Paul Adrian Glaubitz 2020-08-28 16:21 ` John Paul Adrian Glaubitz 2020-08-28 16:30 ` Rich Felker 2020-08-28 16:30 ` Rich Felker 2020-08-28 16:38 ` John Paul Adrian Glaubitz 2020-08-28 16:38 ` John Paul Adrian Glaubitz 2020-08-28 17:03 ` Rich Felker [this message] 2020-08-28 17:03 ` Rich Felker 2020-08-29 0:49 ` Rich Felker 2020-08-29 0:49 ` Rich Felker 2020-08-29 11:09 ` John Paul Adrian Glaubitz 2020-08-29 11:09 ` John Paul Adrian Glaubitz 2020-09-03 3:56 ` Rich Felker 2020-09-03 3:56 ` Rich Felker 2020-09-03 5:46 ` Rich Felker 2020-09-03 5:46 ` Rich Felker 2020-09-03 6:04 ` John Paul Adrian Glaubitz 2020-09-03 6:04 ` John Paul Adrian Glaubitz 2020-09-03 6:17 ` Rich Felker 2020-09-03 6:17 ` Rich Felker 2020-09-03 6:03 ` John Paul Adrian Glaubitz 2020-09-03 6:03 ` John Paul Adrian Glaubitz 2020-07-22 23:13 ` [PATCH 4/4] sh: bring syscall_set_return_value in line with other architectures Michael Karcher 2020-07-22 23:13 ` Michael Karcher 2020-07-22 23:20 ` John Paul Adrian Glaubitz 2020-07-22 23:20 ` John Paul Adrian Glaubitz 2020-07-22 23:19 ` [PATCH 1/4] sh: Fix validation of system call number John Paul Adrian Glaubitz 2020-07-22 23:19 ` John Paul Adrian Glaubitz
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=20200828170259.GZ3265@brightrain.aerifal.cx \ --to=dalias@libc.org \ --cc=glaubitz@physik.fu-berlin.de \ --cc=kernel@mkarcher.dialup.fu-berlin.de \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=ysato@users.sourceforge.jp \ /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: linkBe 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.