From nobody Fri Dec 19 09:19:18 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 4dXhn25SGWz6LBNX for ; Fri, 19 Dec 2025 09:19:18 +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 4dXhn23fVdz455R for ; Fri, 19 Dec 2025 09:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766135958; 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=kFRf+EmaCPS63/2PKUfabMvxCIH6PglcoRC8UvA+t4E=; b=NWUloIInGN+ohEbzX2eJOQlxUEOtFc5Bod2b8unvG50qNsvl7CuxB32iHtSr90SmBevy8g QuvZz+LHZjyDSDXoWNlmZ2zFL9mCUMLhWH/hoZKFHGMvhx1UMEy4up8sRrC9d2kWn/xzTK SIwLyOvw2d8sCoLWO3FOpH9efqPkGGKYezX01FnzgpP99G0dQdRRfp3dol9XEiS4DBPrhT oVEOFvkbbDK0ZwUwvym69JsbYU6UnMgSK55Ekpqqyck8ns2yuIumCSjtrezD6n5JdSQegl 9mxwBOnnW2ne1xFeCj9uI/PGdEAqQV1uKk4nzFzt4KW/Ui5W0kcxk3xxLDhJow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766135958; 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=kFRf+EmaCPS63/2PKUfabMvxCIH6PglcoRC8UvA+t4E=; b=HvK+grsIYOIYsXPkr4AohBA7IhPrJ7dl98MW5beY2Q6a31NmN7DLXAJmEBpK27Sbr5N/VU D8Knzvo2PZBjQcFY3V84C2V5LtkS9dgTsNQWzfEgIguEmrJBzqEgLksVXSdXnA9cQoT+6h Opxeg38c7yeoSXpdMg4F0sRDVD/bBdBfuu20NBZ3E3kDN5QTXFLdyKk/XozAUIzSDct76c EmFJWdaqkdVXpLHlAOhIOZgcnd3wUs+EB+io7hKvIC6EnxarsL3ArNVIRtP4ZQvxiCg0Qz rutrcOQNfzerNpJRdL9KIe1ZvomdJo/1LNIh0QqHg5nx8fAZzVMisrKtEisuwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766135958; a=rsa-sha256; cv=none; b=EhdUWUJWjkxR2NWMTBGUrWTS6GPUs4i8yQC8Ob7IW+biRB2U2ZUPpHnk9cA0FcfkquQ9lO UPv287gMSi5EU5YIEwcrPGy/suhy/GReqpiWE67LF3os2BHkDosQkcVJLKXfmaD0IA/ea0 PEpzUO7q3+loyFzizuYUzj95zXsaX5pSWdt2hJy51V3yt/KUthp4dojnNMifgt2y1jnzfJ udYdzQTTSm+e5yxtJTrVl25zMvcj+64SPynHkS+iiYqX3JhR8uNz2TMRWkfgLRepFQTENm 8Me1QACxUF3iONrmkMKUvElRn5HLNW4pbFQG2hxYFREgFCYipv9zLpEfsvB81Q== 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 4dXhn22n0Fz1GL0 for ; Fri, 19 Dec 2025 09:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f17b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 09:19:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: cc16a07a8e8f - stable/14 - kern: Fix credentials leaks on RACCT but no RCTL 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cc16a07a8e8fc4921e5072bff6263315918cf7bf Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 09:19:18 +0000 Message-Id: <69451896.3f17b.51b15830@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cc16a07a8e8fc4921e5072bff6263315918cf7bf commit cc16a07a8e8fc4921e5072bff6263315918cf7bf Author: Olivier Certner AuthorDate: 2025-10-29 16:46:39 +0000 Commit: Olivier Certner CommitDate: 2025-12-19 09:16:47 +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. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53456 (cherry picked from commit f4315ff8b3fee71eb0098864a84618f2f8ba85d5) --- 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 c449aba9b56a..801424794eac 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2705,6 +2705,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 ceba563413df..f6070cae24d5 100644 --- a/sys/kern/kern_loginclass.c +++ b/sys/kern/kern_loginclass.c @@ -226,6 +226,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 c3908c8e99c9..db7377ed9c9c 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -964,6 +964,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); @@ -1342,6 +1344,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); @@ -1488,6 +1492,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);