From nobody Mon Feb 21 14:55:06 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3AC7219CA986; Mon, 21 Feb 2022 14:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K2QMH18kgz3tZG; Mon, 21 Feb 2022 14:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HLJrIXmBp3jUtI6/UPHeO+xGC+NVo06lpIhLWuyoBpk=; b=vPmcNyvIkuFdrPkkruQivSLyxW6cNCCFZgqSyKLQDQXYefT35Qm6gdqrtIdCVu/O7/n3AT FvkW0JYnUJfGuv8DV/SZhMnzC/wwKYJPYopDdZNSOQfOAi7jwI4FSARRemuEd+XfKMFvKG FMAR7XnvMcvdhzaK3VdGxK5HVmqO5s9P3zJiQd/FOoKAEKAkjrUn+LJPUDsCmdH9tnqZen gBO6cawXr1DCIdD9ZcHQw5S8FkV9OKHhJp6SI5Apj0wmbL5cYBFoYZvDFGpUJ6xJMiGq4I 8U7Gh57CHWZVMANibnvIV/73GriTyTtAFCqjdv0tcoSJOaKplBzLk2EEOT1uVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07C0612511; Mon, 21 Feb 2022 14:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LEt6GQ085772; Mon, 21 Feb 2022 14:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LEt6EC085771; Mon, 21 Feb 2022 14:55:06 GMT (envelope-from git) Date: Mon, 21 Feb 2022 14:55:06 GMT Message-Id: <202202211455.21LEt6EC085771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: d3f0d2c0eef6 - stable/13 - linux: Add additional ptracestop only if the debugger is Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3f0d2c0eef6ef2092cd66db02aace57eb3c6a4d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HLJrIXmBp3jUtI6/UPHeO+xGC+NVo06lpIhLWuyoBpk=; b=udJ90OBNpiCdLf2DGkjt8xysS2Dy+nG1JDR5rOP0edGRIMXmPiZ2Uv5JkxLR1UrUh15D2k fwkdkytT94kMnj/vVbLxt5UNCCmguVIJ/OFkruJRnXtt0bJxmV2h7p5mP0poS8IW6hop5s IToQqCoKkbQxUpaB5pP07lrpo7cTPwjG0Rb+ukK4mbEG2eWGgCHOiHZhlK1l9tWTHyHmyZ t5Mvn7giA7m13bSXut0clZmap3plC4f+J0lqLzRPB60rsTT6QcT/OF2gCcd++G+SoZ6Aqo rjq5XzUKP640jfN19WLBvvA84Vx3fOg5toiLWJ2NijKI9YCx4qen9iZJonupsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645455307; a=rsa-sha256; cv=none; b=exTL8yk43bvE99IJ2D5gn5KqhK/LG+9ldau+nKoB/5H02pv9bt4Z6oEjoc67fhpfrcvrM/ TU+ysLlaAkYyaTUOeq1P7NZsd8taHJB9Nz3/n2N7HVe2e9DLxQo8pBW0pVb9qPeQtkNgft 1RX6Pnp6682ab/MkTmPveUdlUqTSIGo9M4UUriZtWYfEseT4Nc4LlrEUuRG7VDZC2vy4rp jIv/u0KAJHG1nFlfvAfdqM3PlXfsSjIJCWowpt4724OltUBJd836PW5UsOHS/xHWHj1LB5 kiHYiUdFtHNoea//kHdoqutSIVCyg0iWlJ3CYmfCg32Y5oxPqMaHO2EihapglQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=d3f0d2c0eef6ef2092cd66db02aace57eb3c6a4d commit d3f0d2c0eef6ef2092cd66db02aace57eb3c6a4d Author: Edward Tomasz Napierala AuthorDate: 2021-10-30 08:53:55 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-21 14:31:22 +0000 linux: Add additional ptracestop only if the debugger is Linux In 6e66030c4c0, additional ptracestop was added in order to implement PTRACE_EVENT_EXEC. Make it only apply to cases where the debugger is a Linux processes; native FreeBSD debuggers can trace Linux processes too, but they don't expect that additonal ptracestop. Fixes: 6e66030c4c0 Reported By: kib Reviewed By: kib Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D32726 (cherry picked from commit 8bbc0600cc21bbfdc3b8e67199eec4220952b7e3) --- sys/kern/subr_syscall.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index dee81ba0fa48..8507c5393c01 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -261,9 +261,15 @@ syscallret(struct thread *td) * the exec event now and then clear TDB_EXEC so that * the next stop is reported as a syscall exit by * linux_ptrace_status(). + * + * We are accessing p->p_pptr without any additional + * locks here: it cannot change while p is kept locked; + * while the debugger could in theory change its ABI + * while tracing another process, the outcome of such + * a race wouln't be deterministic anyway. */ - if ((td->td_dbgflags & TDB_EXEC) != 0 && - SV_PROC_ABI(td->td_proc) == SV_ABI_LINUX) { + if (traced && (td->td_dbgflags & TDB_EXEC) != 0 && + SV_PROC_ABI(p->p_pptr) == SV_ABI_LINUX) { ptracestop(td, SIGTRAP, NULL); td->td_dbgflags &= ~TDB_EXEC; }