From nobody Mon Mar 31 02:46:06 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 4ZQwVl4l84z5sTp9; Mon, 31 Mar 2025 02:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZQwVl0XZHz47GL; Mon, 31 Mar 2025 02:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743389167; 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=VmPfqzN21YiZWg79WyL6NebdHjHvN3CNJ9fdRfQoKEE=; b=UIJ5tM+i8yPAMLYc0XZSoG9pg4coLWIp5uutObJ/e99JZLHHiyrvmq3OC7DDCjYnNh9AXj zHXEWY/Z1L47mHLmO2JRL0l0rqbxXPmZ/aJ91MyRM4SQ5NxUuv3nUxfgIXZ3+c46yJXDa7 v5Yy1jBKaHM0bHPHOGiBgnItgQ14gHUxIK9d/iQjm17+ze06m529IHvu3ILMOjmKerAuLL Vt0qrBbm4Zh7kFQleW/u70gp02BWONaPr2VZZ1971eDLexjNuFLpQG3/CFAykiYcCgkIqk UWpKMIYWGF9IbYEhXn9fjHb++/0elInaiOw9JKEmvMPUCgfozA1LrV2RPAKGdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743389167; a=rsa-sha256; cv=none; b=gWrQtxtHN9NJt5yuDLBm6DABZmYPc179VQKR5qPGxVdLeNXkfjBXagDttG8igOq0SAUjm4 wK34w8GgPFFdQIJaj9pnpFo0rTNdCsMZQv23WrbsuKURT7B3ICvMX5gLllh5eecFfFWqog /rZk5PTby+EK4XNTgqszIgjz30gw9Iqu8k8UGCip7p7jaxV362aMAC6/khhcC4jZoP6b39 PSzusZzlzvPYW6W5+jWKgOcGZnaiiOlj8iUt22A36xg7/BO2LoUzqZ9uIm8R2VfcloQnLt 2rdpBk0imqMWxKDsdAgpNwkteTqyeBPsZa+ktNYZIEByrbCg8W7djFRoWG3CkA== 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=1743389167; 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=VmPfqzN21YiZWg79WyL6NebdHjHvN3CNJ9fdRfQoKEE=; b=YsmOSA9z4TPtGYVW0vanTW75QACkWZ6qMMzzhKh2uSBZV9rtJH+aCFooXCXuyJVbv/NBad j/7jfnFVL7bmySddOxL40hpwCQgMD/PyFKADUxcIlQaoLc+/yowXkRbKiwAFIYC0wvfVAX pbIgX82h4QOMaregREVvPhkm25MiKgMlaiTRmaUYwvQuXtuqsjYd9mJQhrYlcy2qrVjKjI C76qvXROtnh/Obn68qTP+/p2wBEGokH7WgAcn4H6wDHYGRPLoS2h/7kwOSTZiEnFMyGVaP OjipmsygEUhIb+ajEahO8aZ7uUsQgN6wpiTQZbHinvIJm2VCYIha1L9PPCuNsA== 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 4ZQwVk6QwPzBRV; Mon, 31 Mar 2025 02:46:06 +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 52V2k6aA066801; Mon, 31 Mar 2025 02:46:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52V2k6N8066798; Mon, 31 Mar 2025 02:46:06 GMT (envelope-from git) Date: Mon, 31 Mar 2025 02:46:06 GMT Message-Id: <202503310246.52V2k6N8066798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 526becbf6e42 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 526becbf6e42331e3680d55fe1e9a82e1b56a735 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=526becbf6e42331e3680d55fe1e9a82e1b56a735 commit 526becbf6e42331e3680d55fe1e9a82e1b56a735 Author: Konstantin Belousov AuthorDate: 2025-03-24 02:44:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-31 02:45:30 +0000 ptrace_test: add test for expanded reporting of syscall args Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49430 --- 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 675d90e144ae..db681293f043 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4160,6 +4160,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. @@ -4476,6 +4523,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);