From nobody Mon Apr 7 01:29:19 2025 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 4ZWBSy6mJvz5sNbB; Mon, 07 Apr 2025 01:29:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWBSv404zz3wnH; Mon, 07 Apr 2025 01:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989359; 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=2kxhq61wZp8jKqEXd3k59XjRTqtbZvv0vF1g5oZHib0=; b=ga9TWUPVED1SgsXxg9tqOOqsHRc0chkHYax1IrhS9Oz44j9FiVGms01A9fJCU4w0bsocT1 kzeeVpGEF6vHtmEEojOpzk3B0I/4WBG16Zo8EBQVzwRH6CgW+WPnruR+K7/MlxOjqCO61I mHJxJ2Ryqj5viS7S93nIQHpXJ8oQczEogfAm9qfoIwgKxYYkahFOOK97Fqbi/YhQYbAXFZ pDGivqYJpRt/uESoWjnO8UuCGV4ra1sX6+3u8e2HkmDnUMVll7AYNytsr6jcwlbfzyf37B wnMOOiMk+eKWrZfWlXgnVaG8WLixcQjrWrhV7TNcmMyM7JfE9frUGxE2WxLQ0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989359; a=rsa-sha256; cv=none; b=Mf91cIeeO9yDFLAnWzbRMTiKYSLn87ZGZjoSXCBwL8msUc/kPMUcXSXDG/d7arMPhMA9rG bZZceFlDRioeNRNLJV2hkCdIBvitbTYC5QufJRLTJnwv0stQP7g6OXP3YXcm3px/uuE/Gm 2MqWqPjFCIdNGVTH0lx3KQxdOSgv1Y546WvGcDG+8VpeUQpi2u8iIkaqTY6prSlpTLjqOw jDbT/ul3Bc8MMOTqdXYQ3f/booUYIXcThLnR1Sk3A5/F99OndXCyXV0adOzGmB0oKXBuIy WePM3BmtNFszpVKaHMeRBgbY476+gluTe5nO1u5eB9a2liWktq480r5LCf3osg== 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=1743989359; 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=2kxhq61wZp8jKqEXd3k59XjRTqtbZvv0vF1g5oZHib0=; b=xYrbgrHpaXtCHZzht7tqU5SETI3swWa0nj2r3fCuffT2ZSRkwVPZojkYJnW5o/yV24tNgS g3GDKLPsfzSQEDRf9IAk2GhA8p/rhCsqX9ymMrMg34qI/78r9a9Mvdthi5EFgQk1SnjCVC lx/dwjAtFCox4UrvcUQKjQa8SFkP7GcTwA2IaLFz3V+YUYcwSwdYTsAYGoVmt8hf30aDpy x4Gn5ljq5WokJEBl2r4gMIwfFVURgBnGmEZ/drU21pzejJ1RuTC6j10RunAXtNLSf9cSuH 23A0qeYZ5uboYZok0jbXK/b2+dnBV5mDJc3h7+NUVk4oMpwDgIrSRYhVSXEC9g== 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 4ZWBSv2Hnkz9fv; Mon, 07 Apr 2025 01:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5371TJMw063498; Mon, 7 Apr 2025 01:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371TJdm063495; Mon, 7 Apr 2025 01:29:19 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:19 GMT Message-Id: <202504070129.5371TJdm063495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ca3222c4fcf3 - stable/14 - ptrace_test: add test for expanded reporting of syscall args 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ca3222c4fcf3d9c704acf86d59fe96b5fc9b454d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca3222c4fcf3d9c704acf86d59fe96b5fc9b454d commit ca3222c4fcf3d9c704acf86d59fe96b5fc9b454d Author: Konstantin Belousov AuthorDate: 2025-03-24 02:44:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:23 +0000 ptrace_test: add test for expanded reporting of syscall args (cherry picked from commit 526becbf6e42331e3680d55fe1e9a82e1b56a735) --- tests/sys/kern/ptrace_test.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 40a9beda3006..9aff1738f293 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4161,6 +4161,53 @@ ATF_TC_BODY(ptrace__syscall_args, tc) REQUIRE_EQ(errno, ECHILD); } +/* + * Check that syscall info is available whenever kernel has valid td_sa. + * Assumes that libc nanosleep(2) is the plain syscall wrapper. + */ +ATF_TC_WITHOUT_HEAD(ptrace__syscall_args_anywhere); +ATF_TC_BODY(ptrace__syscall_args_anywhere, tc) +{ + struct timespec rqt; + struct ptrace_lwpinfo lwpi; + register_t args[8]; + pid_t debuggee, wpid; + int error, status; + + debuggee = fork(); + ATF_REQUIRE(debuggee >= 0); + if (debuggee == 0) { + rqt.tv_sec = 100000; + rqt.tv_nsec = 0; + for (;;) + nanosleep(&rqt, NULL); + _exit(0); + } + + /* Give the debuggee some time to go to sleep. */ + sleep(2); + error = ptrace(PT_ATTACH, debuggee, 0, 0); + ATF_REQUIRE(error == 0); + wpid = waitpid(debuggee, &status, 0); + REQUIRE_EQ(wpid, debuggee); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + error = ptrace(PT_LWPINFO, debuggee, (caddr_t)&lwpi, sizeof(lwpi)); + ATF_REQUIRE(error == 0); + ATF_REQUIRE(lwpi.pl_syscall_code == SYS_nanosleep); + ATF_REQUIRE(lwpi.pl_syscall_narg == 2); + error = ptrace(PT_GET_SC_ARGS, debuggee, (caddr_t)&args[0], + lwpi.pl_syscall_narg * sizeof(register_t)); + ATF_REQUIRE(error == 0); + ATF_REQUIRE(args[0] == (register_t)&rqt); + ATF_REQUIRE(args[1] == 0); + + error = ptrace(PT_DETACH, debuggee, 0, 0); + ATF_REQUIRE(error == 0); + kill(SIGKILL, debuggee); +} + /* * Verify that when the process is traced that it isn't reparent * to the init process when we close all process descriptors. @@ -4477,6 +4524,7 @@ ATF_TP_ADD_TCS(tp) #endif ATF_TP_ADD_TC(tp, ptrace__PT_LWPINFO_stale_siginfo); ATF_TP_ADD_TC(tp, ptrace__syscall_args); + ATF_TP_ADD_TC(tp, ptrace__syscall_args_anywhere); 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);