From nobody Thu Nov 06 23:11:55 2025 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 4d2dHc0pBpz6Ft2T; Thu, 06 Nov 2025 23:11:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2dHb3hcMz3h93; Thu, 06 Nov 2025 23:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470715; 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=ZKszgepW27hi11+FAZN6yaM9CkYkIDv+Y6G/x6HEK3Q=; b=Y7Jo/55uS7Go7RScd0M+25dyLVcygue6qQ3gCiri947za9zzyHOG9uN+RItikKaFsR/hqS Ti/soeLyf4/ESHeMSFI+zDiGdCV651dXWp6GR+fJSEX7C9HXynaesCzaaDlaSGVyeffyEz MN18I/ug+07E3DRBrgAJ5ZguA/HmcDVqMTQGRjhpGv/TTmZlZRJPTWRCTbKOCpZBSFTC83 OTABkkLh7yWPyI/jm+QHX/O70wu0CzCpaGYmhZF1AWoBTz4k9iU66266FU2pUd4MzjkARU 5AStRE+YOEKo+yh2gvyJh9xpTeVllPYSNSiHS+S/ZjCrNtWZehgcvNwVOTAikg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470715; 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=ZKszgepW27hi11+FAZN6yaM9CkYkIDv+Y6G/x6HEK3Q=; b=BB0EXvZxYqywbSQNMhI5TzVEo8V1Jx/MIobipgLSMlgcQcpV+jwby0AoBMldDKFp0henZH IuU/CQeyCSvG2qG5OzchPf2Cr3ZExxR+BLrexeyFiw/9VudWPWzHZVYxUUnGatsXxYDkuM DpEi35J8GTHMUD4ZDzKZ9R9MuuSyuXHVrj7qitasbgQBcZOxYyBIvVMdUS7rum7OGwr/QT eLMt9yxon4vN5GrCsN34pprclXbOeBl1WjJSer/n051WYkBqE8tqwsM0U+GU9WTpmFn6vf /Sdk6iJib4P4nam6zdbfTDIC9gw46NefjxHMHYBpzfyY+e9MSdVogRCszReYbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470715; a=rsa-sha256; cv=none; b=SSJLA7UIFtDbZW0sLPdgzbXmXR+b6xcY8RW2ztnbigzEQn1jI9xHynvzAxL/2Q+XxBNCFI YnPp35DcTgCGN0iQhStEqPwLu8QTGcArTNeEt4lEebM7RUuOzMbKl82W0ODHIq4HrBmLhe +DRFTaeFeHy0Vszhyi3cf2k5XZmxeMmMd4uFAmgdnTGCIRTXu06FgKloDV0gO4QIiik9sQ ViyNmKAoJGjtiXo0meBUtwuO7SvyHvk3XMgk47xqeMPhhvH6T2MYcrJubVR5960YVVgY0C WFyMzPtun3vtopfdXbL/EpOCOV2RrmSJAl33i7e65Ali1ypYVkQRIxh/D+QvZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d2dHb3GJbzZwb; Thu, 06 Nov 2025 23:11:55 +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 5A6NBtPw010516; Thu, 6 Nov 2025 23:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBt00010513; Thu, 6 Nov 2025 23:11:55 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:55 GMT Message-Id: <202511062311.5A6NBt00010513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c3a27fa06627 - releng/15.0 - kern: Fix credentials leaks on RACCT but no RCTL 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c3a27fa0662724477239157a5a19e673798eabfe Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c3a27fa0662724477239157a5a19e673798eabfe commit c3a27fa0662724477239157a5a19e673798eabfe Author: Olivier Certner AuthorDate: 2025-10-29 16:46:39 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:08 +0000 kern: Fix credentials leaks on RACCT but no RCTL Affected system calls: setuid(), setreuid(), setresuid(), jail_attach(), setloginclass(). In these system calls, the crhold() calls that, on RACCT, make the just-installed process credentials survive a concurrent change of the same credentials just after PROC_UNLOCK() were not matched by a corresponding crfree() when RCTL is off. In fact, in that latter case, they are simply not necessary, so wrap them with '#ifdef RCTL' stances. 'kern_rctl.c' causes a compile error if RACCT is not defined but RCTL is, so ease reading by not nesting '#ifdef's. Approved by: re (cperciva) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53456 (cherry picked from commit f4315ff8b3fee71eb0098864a84618f2f8ba85d5) (cherry picked from commit 4db768b01cd78666949bbd67ba611e9e47ed710d) --- sys/kern/kern_jail.c | 2 ++ sys/kern/kern_loginclass.c | 2 ++ sys/kern/kern_prot.c | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 267b60ffb5bc..523b7e314a10 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3047,6 +3047,8 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) setsugid(p); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_loginclass.c b/sys/kern/kern_loginclass.c index 55db6c28a1db..0c111c4f78d8 100644 --- a/sys/kern/kern_loginclass.c +++ b/sys/kern/kern_loginclass.c @@ -225,6 +225,8 @@ sys_setloginclass(struct thread *td, struct setloginclass_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a4c5bcc52529..df725cfebd97 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -982,6 +982,8 @@ sys_setuid(struct thread *td, struct setuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1390,6 +1392,8 @@ sys_setreuid(struct thread *td, struct setreuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1536,6 +1540,8 @@ sys_setresuid(struct thread *td, struct setresuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p);