mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Dmitry V. Levin" <ldv@altlinux.org>
To: Michael Ellerman <mpe@ellerman.id.au>, Oleg Nesterov <oleg@redhat.com>
Cc: Elvira Khabirova <lineprinter@altlinux.org>,
	Eugene Syromyatnikov <esyr@redhat.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	Breno Leitao <leitao@debian.org>,
	Andy Lutomirski <luto@kernel.org>,
	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 23/25] powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call
Date: Mon, 10 Dec 2018 07:31:20 +0300	[thread overview]
Message-ID: <20181210043120.GW6131@altlinux.org> (raw)
In-Reply-To: <20181210042352.GA6092@altlinux.org>

From: Elvira Khabirova <lineprinter@altlinux.org>

Arch code should use tracehook_*() helpers, as documented
in include/linux/tracehook.h,
ptrace_report_syscall() is not expected to be used outside that file.

The patch does not look very nice, but at least it is correct
and opens the way for PTRACE_GET_SYSCALL_INFO API.

Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>
Fixes: 5521eb4bca2d ("powerpc/ptrace: Add support for PTRACE_SYSEMU")
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Eugene Syromyatnikov <esyr@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Breno Leitao <leitao@debian.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Elvira Khabirova <lineprinter@altlinux.org>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---

Notes:
    v5: reverted to a simple approach, compile- and run-tested
    v4: rewritten to call tracehook_report_syscall_entry() once, compile-tested
    v3: add a descriptive comment
    v2: explicitly ignore tracehook_report_syscall_entry() return code

 arch/powerpc/kernel/ptrace.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index afb819f4ca68..714c3480c52d 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -3266,12 +3266,17 @@ long do_syscall_trace_enter(struct pt_regs *regs)
 	user_exit();
 
 	if (test_thread_flag(TIF_SYSCALL_EMU)) {
-		ptrace_report_syscall(regs);
 		/*
+		 * A nonzero return code from tracehook_report_syscall_entry()
+		 * tells us to prevent the syscall execution, but we are not
+		 * going to execute it anyway.
+		 *
 		 * Returning -1 will skip the syscall execution. We want to
 		 * avoid clobbering any register also, thus, not 'gotoing'
 		 * skip label.
 		 */
+		if (tracehook_report_syscall_entry(regs))
+			;
 		return -1;
 	}
 
-- 
ldv

  parent reply	other threads:[~2018-12-10  4:31 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20181210042352.GA6092@altlinux.org>
2018-12-10  4:27 ` [PATCH v5 01/25] alpha: define remaining syscall_get_* functions Dmitry V. Levin
2018-12-10  4:28 ` [PATCH v5 02/25] Move EM_ARCOMPACT and EM_ARCV2 to uapi/linux/elf-em.h Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 03/25] arc: define syscall_get_arch() Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 04/25] c6x: " Dmitry V. Levin
2018-12-11 22:40   ` Mark Salter
2018-12-10  4:29 ` [PATCH v5 05/25] elf-em.h: add EM_CSKY Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 06/25] csky: define syscall_get_arch() Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 07/25] h8300: define remaining syscall_get_* functions Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 08/25] Move EM_HEXAGON to uapi/linux/elf-em.h Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 09/25] hexagon: define remaining syscall_get_* functions Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 10/25] Move EM_NDS32 to uapi/linux/elf-em.h Dmitry V. Levin
2018-12-10  4:29 ` [PATCH v5 11/25] nds32: define syscall_get_arch() Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 12/25] nios2: " Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 13/25] m68k: add asm/syscall.h Dmitry V. Levin
2018-12-10  8:45   ` Geert Uytterhoeven
2018-12-10 12:40     ` Dmitry V. Levin
2018-12-10 13:06       ` Geert Uytterhoeven
2018-12-10 13:30         ` Dmitry V. Levin
2018-12-12  8:55           ` Dmitry V. Levin
2018-12-12  9:01             ` Geert Uytterhoeven
2018-12-12  9:27               ` Dmitry V. Levin
2018-12-12  9:43                 ` Geert Uytterhoeven
2018-12-12 12:04                   ` Dmitry V. Levin
2018-12-12 12:27                     ` Geert Uytterhoeven
2018-12-12 12:37                       ` Dmitry V. Levin
2018-12-12 12:54                         ` Geert Uytterhoeven
2018-12-12 13:07                           ` Dmitry V. Levin
2018-12-12 23:12                             ` Dmitry V. Levin
2019-03-29 22:04             ` Dmitry V. Levin
2019-03-30 20:57               ` Geert Uytterhoeven
2018-12-10  4:30 ` [PATCH v5 14/25] mips: define syscall_get_error() Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 15/25] parisc: " Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 16/25] powerpc: " Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 17/25] riscv: define syscall_get_arch() Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 18/25] Move EM_XTENSA to uapi/linux/elf-em.h Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 19/25] xtensa: define syscall_get_* functions Dmitry V. Levin
2018-12-10  5:02   ` Max Filippov
2018-12-10 12:53     ` Dmitry V. Levin
2018-12-10 20:14       ` Max Filippov
2018-12-10 20:24         ` Dmitry V. Levin
2018-12-10 20:30           ` Dmitry V. Levin
2018-12-10 21:29             ` Max Filippov
2018-12-12 10:45   ` kbuild test robot
2018-12-19  5:58   ` kbuild test robot
2018-12-10  4:30 ` [PATCH v5 20/25] Move EM_UNICORE to uapi/linux/elf-em.h Dmitry V. Levin
2018-12-10  4:30 ` [PATCH v5 21/25] unicore32: add asm/syscall.h Dmitry V. Levin
2018-12-10  4:31 ` [PATCH v5 22/25] syscall_get_arch: add "struct task_struct *" argument Dmitry V. Levin
2018-12-10 17:29   ` Kees Cook
2018-12-11 22:44   ` Mark Salter
2018-12-10  4:31 ` Dmitry V. Levin [this message]
2018-12-10  4:31 ` [PATCH v5 24/25] ptrace: add PTRACE_GET_SYSCALL_INFO request Dmitry V. Levin
2018-12-10 14:11   ` Oleg Nesterov
2018-12-10 16:21     ` Dmitry V. Levin
2018-12-11 15:29       ` Oleg Nesterov
2018-12-11 16:23         ` Dmitry V. Levin
2018-12-11 20:27           ` Dmitry V. Levin
2018-12-12 18:00             ` Oleg Nesterov
2018-12-10 14:26   ` kbuild test robot
2018-12-10 16:09     ` Dmitry V. Levin
2018-12-10 18:04       ` Paul Burton
2018-12-10 21:04         ` Palmer Dabbelt
2018-12-10 19:38       ` Andy Lutomirski
2018-12-10 17:44   ` Kees Cook
2018-12-12  9:28   ` kbuild test robot
2018-12-10  4:31 ` [PATCH v5 25/25] selftests/ptrace: add a test case for PTRACE_GET_SYSCALL_INFO Dmitry V. Levin

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=20181210043120.GW6131@altlinux.org \
    --to=ldv@altlinux.org \
    --cc=benh@kernel.crashing.org \
    --cc=esyr@redhat.com \
    --cc=leitao@debian.org \
    --cc=lineprinter@altlinux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=luto@kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=oleg@redhat.com \
    --cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome