From nobody Wed Sep 06 21:56:44 2023 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 4Rgx6N4brGz4sJK0; Wed, 6 Sep 2023 21:56:44 +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 4Rgx6N24kpz3bKC; Wed, 6 Sep 2023 21:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037404; 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=MAm4SlH5VVVNF2GN2cG9mhiXswX+7ctk1PXIDP+w17U=; b=yo0mJOmCEavXwgoHj8mrrtCDftfD9m8H9oYj1leYwX/c6JOGSFVMrx2kzl7kdzKbIAMeSU iG9nnt01yWwxj57ZwJhv83kTmP/TwPTBS+kmQCjs5nvzZoVPGYtXQgCHaIDuShsSZn4BuJ iTiL8EvmnHU4ayHsQ6Afu8AsYpPGGoIRQR33YaZJtIhqqLhKb6ZFZwNrScWGnUwaV71lGn KxCvQJen460wbShshbnmvNzi6IzAjQKsyfzIBmB614ySfmXhcpp+8f22sey/EyF8Z5CJuw 8YGCHsX6U9Twa/34v+Yim9sDXn0RBkqISabTnu/iDyN6rIYDfyZzyrVPf/Xy9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037404; a=rsa-sha256; cv=none; b=sm7NnAPV9CrDcEJWsKkgRIRu1eQ9z77SshrNs83YW1qpAcToX8VFeiSKKSiJrh2hXVUZwp kLPWq2S+oUxZjiclXIkm8bdtEdYvMp8PglyZS6nDSlWsHzSTQWR5OGCq4/iP3xayezT5on 2u9mqh+VB/RggHNeh6PdXH3FUIEWCO/ijUQBfay2t/8C66k3OGouTrmQ2ZIz5deQKuRoeg u6VGywrvaEQlyt402X/APET19K5T8gKdemBdFTgWyUmMA+alPQjoLGCrxh/yXmccsrlfW3 A1NfhFggPNCbVxrKT9sRRTAlmP9m1QbEzYm/6jFxWqRjmxx0ocsbu4DGEEy3VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037404; 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=MAm4SlH5VVVNF2GN2cG9mhiXswX+7ctk1PXIDP+w17U=; b=nms5oIvXw2Ae2BqBd/kPCV9YJWcQc57oxzHJKsh4iEjacVGNl2sYHJabG/ZQBLHf2rjyUJ HKFsl/us0na3HclwOjpU24fBL3M6Zl/yMpxt95k1aVwsYtpSTQTTz1Q1ueA1jSpUkmVw4r N4AXMwXzsTJb5KxnTPxAQB07OHpSISqztslnTna58YG8qItWjQafvpqKyLzZxwG2JdZCFB beWL9ES3IMiWXC6uUhpT1dEQuTXAGFotYXX9/ugwEvdwdN5vUORO4/w/V+krfKJ2Cdua6A +e1xdTjX5pD8/qlZAYSfSrxrCItipYLI2PP27738O/iW8fbhClNhIwPoRRw+lg== 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 4Rgx6N0vkczYmS; Wed, 6 Sep 2023 21:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuiGg022904; Wed, 6 Sep 2023 21:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Luinp022901; Wed, 6 Sep 2023 21:56:44 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:44 GMT Message-Id: <202309062156.386Luinp022901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 21ccba43f511 - stable/13 - ptrace: Clear TDB_BORN during PT_DETACH. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21ccba43f511cc4089899619b5a85e6d83a200dc Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=21ccba43f511cc4089899619b5a85e6d83a200dc commit 21ccba43f511cc4089899619b5a85e6d83a200dc Author: John Baldwin AuthorDate: 2023-06-07 19:26:57 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 ptrace: Clear TDB_BORN during PT_DETACH. If a debugger detaches from a process that has a new thread that has not yet executed, the new thread will raise a SIGTRAP signal to report it's thread birth event even after the detach. With the debugger detached, this results in a SIGTRAP sent to the process and typically a core dump. Fix this by clearing TDB_BORN from any new threads during detach. Bump __FreeBSD_version for debuggers to notice when the fix is present. Reported by: GDB's testsuite Reviewed by: kib, markj (previous version) Differential Revision: https://reviews.freebsd.org/D39856 (cherry picked from commit 653738e895ba022be1179a95a85089e7bc66dbbe) --- sys/kern/kern_fork.c | 2 +- sys/kern/sys_process.c | 2 +- sys/sys/param.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 157eba2b3fbc..e3148763b460 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1195,7 +1195,7 @@ fork_return(struct thread *td, struct trapframe *frame) td->td_dbgflags &= ~TDB_STOPATFORK; } PROC_UNLOCK(p); - } else if (p->p_flag & P_TRACED || td->td_dbgflags & TDB_BORN) { + } else if (p->p_flag & P_TRACED) { /* * This is the start of a new thread in a traced * process. Report a system call exit event. diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 6f53f1ae43b4..2eaeabb6a5f9 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1288,7 +1288,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) SIGSTOP); } td3->td_dbgflags &= ~(TDB_XSIG | TDB_FSTP | - TDB_SUSPEND); + TDB_SUSPEND | TDB_BORN); } if ((p->p_flag2 & P2_PTRACE_FSTP) != 0) { diff --git a/sys/sys/param.h b/sys/sys/param.h index 376d1aaa2187..ba64cfa4b5df 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -59,7 +59,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1302507 /* Master, propagated to newvers */ +#define __FreeBSD_version 1302508 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,