From nobody Thu Jun 29 08:20:31 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 4QsBGR5MWTz4knpP; Thu, 29 Jun 2023 08:20:31 +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 4QsBGR2Jjsz3vPc; Thu, 29 Jun 2023 08:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026831; 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=/38UW8dMTAzb+vX1014HTpyg/EoCSy80t053MOi5sZQ=; b=NL5+VtR/5/n5DCbjyczccSRy1jEq7pQiizct+3PGqTOfCPwgwRnUYLQhEwo2LMheIuI+m6 UQAKcmH60WcfIFmWgOwKGfrbLhfULuu1Ie6A7lDVwxbmtxbsIZ1Yz/q/Vc43TXU6SJPdd+ J4A9UcrJBRP5AtEP86kwlV7M2Fx+ccLkGfCnE9gqozv96jUDwGXjZi1kJs5qafDRBHiJom AXvmcT1zG5mkp2KLnot1BblRMtDUcxbAaojR6lMm3uPuHnX6Y6r46DEQ1P5yrJeA5gSisD xJna0CH84thwswuiJ6aTjUAEM9RXDAGO9SW1F0vZpeNMpEe0Maewj2LFqAPHWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026831; 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=/38UW8dMTAzb+vX1014HTpyg/EoCSy80t053MOi5sZQ=; b=Sox2Yo2wG5WE5ZoKN158njg527CjZaiue2K/a86i5etmGMxF009W0hkLky4WCcRm1GGF+S Cbldu4w6bHlI6HfKnUxkbQ4aMrisZqSbwei6lKhSaW+5vWhz+gbtevo64+9UhkjhNrR/zs qprhjtx4lR3ogiVkP7ceZfdTvp7YESo5XPDu8hg6lccQvie4np7dwkhOAX8dfDqYralytI AIlmVVxVj9auEEOGUwbvaCCPFS48rL6n2MmqUYselGZetuXI/yqH8j7d5HLptsijPsU7yL kAhnHG+1HDJoxaxPrjD+Y+x+1+FtzuZFqGeAY7dHo666WCQAAsgxgQPHj/jzQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026831; a=rsa-sha256; cv=none; b=RO8vluNopLfdr/gGtQQ7HTNnJxxMMKNAO3hLkgtGPs3Q+IZ1TRPshfqoZyNwIJKWmUIUIu +QYJ5qLX7iYbPzZUSTLeYeospnrjAMPfdy+jt/d+GFQ0IGh7FEwQQFSBIErd0GItURFoIL tzcddw9Muu05yn+eailGYqZr6n541GgBXBcKx7F/X4yXSGP//DzdICiwbakhx9Tb6Bs7Pk BOKXKqyjIBdVr4gxiXCpXGKwYH4v9FPDC32W2aoeIv3rVC61AlbzemWlRMDjiYMCA1FD1w KMftc2AXBEh8g3rLIwEts+KZRhq3To9mOK7gn0UsSAtz54K8YfBHAU25dfNkeg== 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 4QsBGR1JcHz17gk; Thu, 29 Jun 2023 08:20:31 +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 35T8KVA8083541; Thu, 29 Jun 2023 08:20:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KVHZ083540; Thu, 29 Jun 2023 08:20:31 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:31 GMT Message-Id: <202306290820.35T8KVHZ083540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: cdbdd15ecd8d - stable/13 - ktrace: Fix syscall number on a child return path from fork 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cdbdd15ecd8de38f6b460330d046e8b94c010f86 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cdbdd15ecd8de38f6b460330d046e8b94c010f86 commit cdbdd15ecd8de38f6b460330d046e8b94c010f86 Author: Dmitry Chagin AuthorDate: 2023-05-14 21:23:50 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:57 +0000 ktrace: Fix syscall number on a child return path from fork Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40078 MFC after 1 week (cherry picked from commit ae6ac58745b58c0a3424b3714be1205821d93c51) --- sys/kern/kern_fork.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 068dfdb097d3..eebe2e2259f2 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1118,6 +1118,9 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg, void fork_return(struct thread *td, struct trapframe *frame) { +#ifdef KTRACE + struct syscall_args *sa; +#endif struct proc *p; p = td->td_proc; @@ -1160,7 +1163,9 @@ fork_return(struct thread *td, struct trapframe *frame) userret(td, frame); #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSRET)) - ktrsysret(SYS_fork, 0, 0); + if (KTRPOINT(td, KTR_SYSRET)) { + sa = &td->td_sa; + ktrsysret(sa->code, 0, 0); + } #endif }