From nobody Sat Nov 07 12:11:01 2026 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 4jMFJ63mjhz6yWKm for ; Sat, 07 Nov 2026 12:11:02 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMFJ5755cz3CVX for ; Sat, 07 Nov 2026 12:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794053462; 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=LogOh7TzmgVBqTp+tmqMRV7kYTNp+qr60tuD7/Yq/gg=; b=ktE1eYYhK9C6ZkKj0TFup6tgvd+coVOHjPYw98kaPZ+3NUZbuA8VqWjRruwi7rLS4gx5hn /jaVaFIjWy3VIqdXwSMy3112rzy8Z65Qy2MV4jcuAr/YLxPKxPLvkZhld+Y1VeJYg0PmN9 xP2D8XGlqAt2S0+Jrk87vq/HAllY/61DsDxwyQJwRAFZkEJiBKeJ4xS81K5wdulGRBBCbN 6kINh7AQl2dF5nMv8M+Yljn6cKZuFUh5nOk2QbVdK5laexKIzA9NLZNVKMf+0SrjKyQTaF sZWFOK1DO6EQgAm2uVgKIhwm1uvJKsYG1iy6RlWP/QvHCKqr16kUPBxQPsbqMw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794053462; b=EPA6wplxBnBFBpsphdQl1L1pJBpD+I+Jw4/RasRlolGoL4wB6d7DJ2IIMt78LtzJgxDOYP PXSUn9a4LOwizbQ0CJVKUxfLkNN7PuH99WvTuTs+CFmM3rsKe2tFmy+k/2OGWV7qLTtwF5 /doqgzk9zXHiT9kWPCVYyRwTrxTIs2G44WrA2vC3UnsjIT3pQHEcqrOWJdCKUZvqElJvcm OMij0Y7XYT8cfIAAuEAKUlc/oj0qbRNbaigLRKM8paFVXG/efjee6oRmZ1HksUnETfINDL ODKAEG5awjnSLilhTdTaDEwbECnCDylYjR3qYwrmce+28Pw1T9gTmsjTMqexiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794053462; 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=LogOh7TzmgVBqTp+tmqMRV7kYTNp+qr60tuD7/Yq/gg=; b=e644nAHCv56x+jk2ypYs0Ekw5Yr5XbaBGsmvTeoum7XOI9uOlk4Tv1sErNsFXUJ0vcRTJG 9YFlf66wmZx8ukUFBGtfi+4g0g4cSY8YBg8hjB7VFh3W7WaNG9CjZPBheucic18tzZxUe7 +0myMZx87mLkUc+XZT76WDIFVg96k7urfID02a0pYdkzz+EG+tRQxspP88wGud2C1HG+Bu ZO1w6BkyYEc977e10Q6S5ASq3E9x6MM0b9Uh2/VAoDMLeK6lJubs38jE+cO3s27N8Xz57t hgJFWPpF/YiLDo10hsKoIZR+rydPAcyAIiu2PJd4LtL//cZuiHtC6PT/I6e1IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jMFJ56lqfzL9V for ; Sat, 07 Nov 2026 12:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 470e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 12:11:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d7c0ab90cde1 - main - acct(2): add kern_acct List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7c0ab90cde19e2184f2d76d0fe43e85c74785d4 Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 12:11:01 +0000 Message-Id: <6aef1555.470e2.78d127b6@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c0ab90cde19e2184f2d76d0fe43e85c74785d4 commit d7c0ab90cde19e2184f2d76d0fe43e85c74785d4 Author: Brooks Davis AuthorDate: 2026-11-07 12:10:45 +0000 Commit: Brooks Davis CommitDate: 2026-11-07 12:10:45 +0000 acct(2): add kern_acct Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_acct.c | 15 +++++++++++---- sys/sys/syscallsubr.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index 4aa0032b7290..6bf7e333358c 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -82,6 +82,7 @@ #include #include #include +#include #include #include #include @@ -197,6 +198,12 @@ SYSCTL_INT(_kern, OID_AUTO, acct_suspended, CTLFLAG_RD, &acct_suspended, 0, */ int sys_acct(struct thread *td, struct acct_args *uap) +{ + return (kern_acct(td, uap->path)); +} + +int +kern_acct(struct thread *td, const char *path) { struct nameidata nd; int error, flags, replacing; @@ -209,9 +216,9 @@ sys_acct(struct thread *td, struct acct_args *uap) * If accounting is to be started to a file, open that file for * appending and make sure it's a 'normal'. */ - if (uap->path != NULL) { + if (path != NULL) { NDINIT(&nd, LOOKUP, NOFOLLOW | AUDITVNODE1, UIO_USERSPACE, - uap->path); + path); flags = FWRITE | O_APPEND; error = vn_open(&nd, &flags, 0, NULL); if (error) @@ -249,7 +256,7 @@ sys_acct(struct thread *td, struct acct_args *uap) * switching from one accounting file to another due to log * rotation. */ - replacing = (acct_vp != NULL && uap->path != NULL); + replacing = (acct_vp != NULL && path != NULL); /* * If accounting was previously enabled, kill the old space-watcher, @@ -260,7 +267,7 @@ sys_acct(struct thread *td, struct acct_args *uap) acct_suspended = 0; if (acct_vp != NULL) error = acct_disable(td, !replacing); - if (uap->path == NULL) { + if (path == NULL) { if (acct_state & ACCT_RUNNING) { acct_state |= ACCT_EXITREQ; wakeup(&acct_state); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 1abd99438bce..c4e842d64893 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -121,6 +121,7 @@ int kern_accept4(struct thread *td, int s, struct sockaddr *sa, int flags, struct file **fp); int kern_accessat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int flags, int mode); +int kern_acct(struct thread *td, const char *path); int kern_adjtime(struct thread *td, struct timeval *delta, struct timeval *olddelta); int kern_audit(struct thread *td, const void *record, u_int length);