From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCEA6C43441 for ; Mon, 26 Nov 2018 14:35:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE90D20862 for ; Mon, 26 Nov 2018 14:35:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE90D20862 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726891AbeK0BaH (ORCPT ); Mon, 26 Nov 2018 20:30:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47951 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726279AbeK0BaH (ORCPT ); Mon, 26 Nov 2018 20:30:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7FBA2155AC; Mon, 26 Nov 2018 14:35:48 +0000 (UTC) Received: from dhcp-27-174.brq.redhat.com (unknown [10.43.17.12]) by smtp.corp.redhat.com (Postfix) with SMTP id 488A383EB8; Mon, 26 Nov 2018 14:35:25 +0000 (UTC) Received: by dhcp-27-174.brq.redhat.com (nbSMTP-1.00) for uid 1000 oleg@redhat.com; Mon, 26 Nov 2018 15:35:48 +0100 (CET) Date: Mon, 26 Nov 2018 15:35:24 +0100 From: Oleg Nesterov To: Elvira Khabirova Cc: rostedt@goodmis.org, mingo@redhat.com, linux-kernel@vger.kernel.org, ldv@altlinux.org, esyr@redhat.com, luto@kernel.org, strace-devel@lists.strace.io, linux-api@vger.kernel.org Subject: Re: [RFC PATCH RESEND v3 3/3] ptrace: add PTRACE_EVENT_SECCOMP support to PTRACE_GET_SYSCALL_INFO Message-ID: <20181126143524.GB1660@redhat.com> References: <20181125022150.46258a20@akathisia> <20181125022340.5703400f@akathisia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181125022340.5703400f@akathisia> User-Agent: Mutt/1.5.24 (2015-08-30) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 26 Nov 2018 14:35:48 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/25, Elvira Khabirova wrote: > > Extend PTRACE_GET_SYSCALL_INFO to support PTRACE_EVENT_SECCOMP stops. > The information returned is the same as for syscall-enter-stops. Oh, this is not nice ;) there must be a better option, I hope... Plus Can't ptrace_get_syscall() check child->exit_code == (PTRACE_EVENT_SECCOMP << 8) | SIGTRAP; to detect the PTRACE_EVENT_SECCOMP case? Oleg. > Signed-off-by: Elvira Khabirova > Signed-off-by: Dmitry V. Levin > --- > include/linux/ptrace.h | 1 + > include/linux/sched.h | 1 + > include/linux/tracehook.h | 1 + > kernel/ptrace.c | 7 +++++-- > 4 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h > index 6c2ffed907f5..a993d0fde865 100644 > --- a/include/linux/ptrace.h > +++ b/include/linux/ptrace.h > @@ -166,6 +166,7 @@ static inline void ptrace_event(int event, unsigned long message) > { > if (unlikely(ptrace_event_enabled(current, event))) { > current->ptrace_message = message; > + current->ptrace_event = event; > ptrace_notify((event << 8) | SIGTRAP); > } else if (event == PTRACE_EVENT_EXEC) { > /* legacy EXEC report via SIGTRAP */ > diff --git a/include/linux/sched.h b/include/linux/sched.h > index a51c13c2b1a0..86215fb654d6 100644 > --- a/include/linux/sched.h > +++ b/include/linux/sched.h > @@ -964,6 +964,7 @@ struct task_struct { > > /* Ptrace state: */ > unsigned long ptrace_message; > + int ptrace_event; > kernel_siginfo_t *last_siginfo; > > struct task_io_accounting ioac; > diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h > index 633a83fe7051..5d2e5aa07a5c 100644 > --- a/include/linux/tracehook.h > +++ b/include/linux/tracehook.h > @@ -66,6 +66,7 @@ static inline int ptrace_report_syscall(struct pt_regs *regs, > return 0; > > current->ptrace_message = message; > + current->ptrace_event = 0; > ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0)); > > /* > diff --git a/kernel/ptrace.c b/kernel/ptrace.c > index 92c47cd5ad84..74a37e74c7f1 100644 > --- a/kernel/ptrace.c > +++ b/kernel/ptrace.c > @@ -904,7 +904,9 @@ static int ptrace_get_syscall(struct task_struct *child, > unsigned long actual_size; > unsigned long write_size; > > - if (child->ptrace_message == PTRACE_EVENTMSG_SYSCALL_ENTRY) { > + if ((child->ptrace_event == 0 && > + child->ptrace_message == PTRACE_EVENTMSG_SYSCALL_ENTRY) || > + child->ptrace_event == PTRACE_EVENT_SECCOMP) { > int i; > > info.op = PTRACE_SYSCALL_INFO_ENTRY; > @@ -917,7 +919,8 @@ static int ptrace_get_syscall(struct task_struct *child, > for (i = 0; i < ARRAY_SIZE(args); i++) > info.entry.args[i] = args[i]; > actual_size = offsetofend(struct ptrace_syscall_info, entry); > - } else if (child->ptrace_message == PTRACE_EVENTMSG_SYSCALL_EXIT) { > + } else if (child->ptrace_event == 0 && > + child->ptrace_message == PTRACE_EVENTMSG_SYSCALL_EXIT) { > info.op = PTRACE_SYSCALL_INFO_EXIT; > info.arch = syscall_get_arch(child); > info.exit.rval = syscall_get_error(child, regs); > -- > 2.19.1 >