From nobody Fri Jun 2 13:17:28 2023 X-Original-To: dev-commits-src-branches@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 4QXk7Y27zdz4YKbQ; Fri, 2 Jun 2023 13:17:29 +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 4QXk7Y1J5qz42NZ; Fri, 2 Jun 2023 13:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711849; 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=3UheO4tBeL8hBPs51DPhlmndovXI8C4nbn3iEO2mgyA=; b=X90KfDzlkN2BXXkt3ST8/jGHcacwnWaBbM3kznsiW+/aKGc5RsqKyGU7LhJrdHKn6J7aVs h5ghXiRM4syvJXKQeEkqw6CEPShCJWghb11H60MpJvlko8WfSz1QnHAh2udycd+K+2XdCQ O02Fr30eJitshq1K+jR3sevzpoezGt/FdmcJMFv7Sh3livux/oNQFHLMrwh7xJVOnkHwTG Qh63qrggRS7r4rlM5RvUzvViA35PYoB1o44sLz1TGLsAukZXryTyoyVMQFuQw6LWRKZGzs uJ89FU9TpY8k6tlZlZSqvU2t4YItyBxrjrpMvZL+YnDHUkWeri2IhOnp6PWaWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711849; 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=3UheO4tBeL8hBPs51DPhlmndovXI8C4nbn3iEO2mgyA=; b=lzb54q61a01J8KXAcOCd+76lfrZ1PbWnB0NJRfGLOaHLkC4WvTiUdxlASWfFgAPNyFPWJG 1vtjxIJ5ZFcM3x4owRpFYeDN3OHTdwKPmS1P5j0lMhqgtJvPwH5BhQK4mTllCc5STwlxFa yhjHwFHV4IBtHrTkA53nzGYTbsVRg9QnuBQJv+nmOWAp9IdsKBVRjf2NnWLb8ZXJmwf/mG xTCJSUw4NxGWwFaWAGRR+moyu8FvG3/PMPkQCH7sb9aWCUjOzP8kp/21MhWvygtHDM6V2p VcZ04R1LVrPq8zOlnZ+QC/4YeSXGFJlHAxoOylGV1NJa50xcbZhjcdR2FKC0vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685711849; a=rsa-sha256; cv=none; b=hzkaFRRP9OxFY/Fn+jO+c5CBVbZhjyaVhl99IAVD7Xia50bVB80er+48n7wyQvfq9ghU6f blJdw92odSUiarJw+aOgqfwGcejPbdzbrsbVufYNpf2Pec0beY9KV5MOblRSB2wbl6lFcy YJuwJl3AI1IlzAMdqJqnPoEbrJHGeU6r1MwivN1aFxKabY0x/790Mka+todk8tcSss4xo8 ZoKRTd80tw52xTeWse7KpfPXRk789AF1Nm3uRRjcO9WXuC1z55ZoLWT+W7Cqr6Jufe+g3F 4aBZz/Do/5GDAb9b8Iy3NEEcL/xCRqqXTx5K1nSTye4s9HL1tXe8ECYzRViTZQ== 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 4QXk7Y0PTHz1185; Fri, 2 Jun 2023 13:17:29 +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 352DHS9E062814; Fri, 2 Jun 2023 13:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352DHSRM062813; Fri, 2 Jun 2023 13:17:28 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:17:28 GMT Message-Id: <202306021317.352DHSRM062813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 797e917ed647 - stable/13 - tests: Add a simple regression test for ptrace(PT_SC_REMOTE) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 797e917ed6478832943a1c1dbec8913fc9ad4aa1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=797e917ed6478832943a1c1dbec8913fc9ad4aa1 commit 797e917ed6478832943a1c1dbec8913fc9ad4aa1 Author: Mark Johnston AuthorDate: 2023-05-26 19:13:20 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 13:17:05 +0000 tests: Add a simple regression test for ptrace(PT_SC_REMOTE) MFC after: 1 week (cherry picked from commit 844942888f7d87885c79d87d808311086c664417) --- tests/sys/kern/ptrace_test.c | 55 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 3e3a445c6152..fbaca43bb6c4 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4314,9 +4314,61 @@ ATF_TC_BODY(ptrace__procdesc_reparent_wait_child, tc) REQUIRE_EQ(close(pd), 0); } -ATF_TP_ADD_TCS(tp) +/* + * Try using PT_SC_REMOTE to get the PID of a traced child process. + */ +ATF_TC_WITHOUT_HEAD(ptrace__PT_SC_REMOTE_getpid); +ATF_TC_BODY(ptrace__PT_SC_REMOTE_getpid, tc) { + struct ptrace_sc_remote pscr; + pid_t fpid, wpid; + int status; + + ATF_REQUIRE((fpid = fork()) != -1); + if (fpid == 0) { + trace_me(); + exit(0); + } + + attach_child(fpid); + + pscr.pscr_syscall = SYS_getpid; + pscr.pscr_nargs = 0; + pscr.pscr_args = NULL; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, sizeof(pscr)) != + -1); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_error == 0, + "remote getpid failed with error %d", pscr.pscr_ret.sr_error); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_retval[0] == fpid, + "unexpected return value %lu instead of %d", + pscr.pscr_ret.sr_retval[0], fpid); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + pscr.pscr_syscall = SYS_getppid; + pscr.pscr_nargs = 0; + pscr.pscr_args = NULL; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, sizeof(pscr)) != + -1); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_error == 0, + "remote getppid failed with error %d", pscr.pscr_ret.sr_error); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_retval[0] == getpid(), + "unexpected return value %lu instead of %d", + pscr.pscr_ret.sr_retval[0], fpid); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + ATF_REQUIRE(ptrace(PT_DETACH, fpid, (caddr_t)1, 0) != -1); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, ptrace__parent_wait_after_trace_me); ATF_TP_ADD_TC(tp, ptrace__parent_wait_after_attach); ATF_TP_ADD_TC(tp, ptrace__parent_sees_exit_after_child_debugger); @@ -4380,6 +4432,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, ptrace__proc_reparent); ATF_TP_ADD_TC(tp, ptrace__procdesc_wait_child); ATF_TP_ADD_TC(tp, ptrace__procdesc_reparent_wait_child); + ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_getpid); return (atf_no_error()); }