From nobody Fri May 26 20:06:53 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 4QSbYB08QBz4CrjM; Fri, 26 May 2023 20:06:54 +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 4QSbY96lsmz3CpY; Fri, 26 May 2023 20:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685131613; 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=c98ZG7ajK+ohn+3m2Zd+/0bPGSx++D7cpoeThTAgvlM=; b=hJBNVRbUki8h5uO0RyMjDnrQL753cMdzS0zTC40FCrD/zoLFoVduAyjrWUblRWMl6AaF0W WTDYC6yZvP/ldpm9nqnKNO4K/NfeuHxsJp5vP2cFx31BN0zjBRthZ6Q19zbz3zS3Y+jvnk V3fwYGtaTkAXeE9YIBRVXWgQmBWuZ3//v4LOWPfPRyUMHqmIX9jw1+Llc3twgv+tl//po5 mRW1GkCh+DoZ8WruhwLxO/yBTOUmEDVkmMF/7Mzy8ToDuw5abQyLV6u3KXIIe/pEJ1Fhdl /N0Kg/9RtX4vLRNru5r/5bp5c8VnsAQEON5m/ZUH10k828JlsmnAiHb/RJ/T9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685131613; 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=c98ZG7ajK+ohn+3m2Zd+/0bPGSx++D7cpoeThTAgvlM=; b=dp90FS+N1WaJ8DOFkBI7YToqtyt2muyOG4calNSJqbfKTgd6vonPItzG8StCOJzZa+ujy9 ktlud/gSZcbhHXCooEyYrU//vS8cTO8ikt5jsSM0AkjAgNo0uiqnlXflvkU5XzazatGaPx 3qQjHGURSS6/qwCTptJmqOxOhNaW5MH/YyzMETgIUQ5MyhAJrxwAwzK5ckLzBfilm9kvL1 bA77iZ+D9ChiUgsRDFNFODk2KnlGGWUM97hwsRf4dwxSpshGhdnyM2/uX/koJEzFsbh8y/ vfxECY3qNfEnvG/I56wA79gy+hck8CWiUe/zZQzeDHH7gk3LMNHEvNDsTPUSTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685131613; a=rsa-sha256; cv=none; b=OKrFtSVIDKsscTOig18IK0OpdW2RVBPohp7UAvritPgKzSJDe2A6QAscqwQqan0C43o9t/ p4RdBQI5NdWCvi1ehNaC/5/3Zly1eXqjNwRMA9A16yD3UL2aQO3US8wPurOeHGMm21Jku0 2KT17DXQ1gUtDCDqM1taSIdIK612m5M5a8+zpzdkJARJG7wq2tpWtaHf81lHm4fO+kYCnH 0BK1osntsC0wJV27l7yzm3BFBeaIC+5pfgk1Vyj+J0hB5bkuSgDM+UzpS5KaTrsqLVYfHx XoaSR0+N5aNWjMS73aiXEq7aUhHaIfkRTKss1Rk4q6neVE/+D8pq9OT5WGpOTw== 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 4QSbY95cGNzK1M; Fri, 26 May 2023 20:06:53 +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 34QK6reS098144; Fri, 26 May 2023 20:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34QK6roO098143; Fri, 26 May 2023 20:06:53 GMT (envelope-from git) Date: Fri, 26 May 2023 20:06:53 GMT Message-Id: <202305262006.34QK6roO098143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 844942888f7d - main - tests: Add a simple regression test for ptrace(PT_SC_REMOTE) 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 844942888f7d87885c79d87d808311086c664417 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=844942888f7d87885c79d87d808311086c664417 commit 844942888f7d87885c79d87d808311086c664417 Author: Mark Johnston AuthorDate: 2023-05-26 19:13:20 +0000 Commit: Mark Johnston CommitDate: 2023-05-26 19:38:08 +0000 tests: Add a simple regression test for ptrace(PT_SC_REMOTE) MFC after: 1 week --- 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 9cee07639f0c..49670fbf102e 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4318,9 +4318,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); @@ -4384,6 +4436,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()); }