From nobody Sun Nov 02 18:17:14 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 4d02xR0fG3z6FDRf; Sun, 02 Nov 2025 18:17:15 +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 4d02xQ5lMMz3Q9V; Sun, 02 Nov 2025 18:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762107434; 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=VymsIlmD3Hy4OiSZUAXQRaQjg18Y2w3jLDoineb+9cc=; b=j+uGg3kxmB7NDmGpPWW5TqiAJjbzQbpRss0thyPQ7NmqUZ1OTCkdsTaN25Z7FZ9UPq2607 nkwnAZaVw/4I+Gs+sfeGllsldqqB/5dnGQRmdUfhuUkHHiXufKUCW88LSdLyZfCbiItq4v cBoOvjrTDNf569NmdMmSCUzfKiI1q+ak2WiUwGTXjx4tP7WwaBvL2Ge8nN8HL3mfP8quTk fGySzFrrhJVZk0vbsdZto/XFRDHS/RgfNs4JhSZgBCpBM0YLBKqQhiCZ6Z+4Jz+ezLo5Ub I0eOXXLaq21bPhjAsx0M226k/mUct5NLB98RzAQkYH4J3G4027GCW5l6Dueogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762107434; 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=VymsIlmD3Hy4OiSZUAXQRaQjg18Y2w3jLDoineb+9cc=; b=M5KY+9qmzxsafA8GSwMcHekmtO8l25M0p7kj1CN19759AX2rhum4kHL5W/Carn20SFMM6B hjwcePZIixtmZ4B6Z7gostC/FCbEpR3xvuTruHbbvyK6Qu47MOWGaXesAiOMsle3/bcOJN OQMMfIYVWLPa/wIDlVIaDtsos5ZU6oR/m0l5LbG7CiCzbjtD/k9Zc95HCect13OxTV4SI+ 8drJmLArc6qdMQq25w+LCJCPChxGtX8+cQQjv9a/shsQ8qz7Bp9nXBAdMDze7kz8GXSL1l OQ+fpgUEos02+LJnvtJStfKUANDD2oUNDkC1dmleO0bmpU33GYMPln0OEirV/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762107434; a=rsa-sha256; cv=none; b=HcFvEmGqru4mMAwQsDFOU7lDsRMq4A9nRbWrkylKyc1Ty8wf/j5v7BDZOrS+runN/Flw1X OdQsgr0lYB+ZJAE5IaOSDiTtAVoRZGA2ZOVHE8sCaoUWMzd0/2cHEgKvUzkrV/7VTbagUx 8w2Uh+1azOerBaTL1ue8LAkbhF3IpCfF8r2ZML6+g5uBQNqbpzSSK1Izguhz+mg0ZHZ6cr 9i9Kzqjh66r7IdgRk1Bx3X367t8HhMxdw+0kyzxCGoH7Xbq1feTxTlYnngZlheIzyyG7AF megnIGHOhLHlftIjbqFj11/xnhLWGEnvBcVbA2568+DxIdQYxOEWqfrBzTEPLw== 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 4d02xQ5FL3zcqQ; Sun, 02 Nov 2025 18:17:14 +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 5A2IHEZF093843; Sun, 2 Nov 2025 18:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2IHEPh093840; Sun, 2 Nov 2025 18:17:14 GMT (envelope-from git) Date: Sun, 2 Nov 2025 18:17:14 GMT Message-Id: <202511021817.5A2IHEPh093840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f4315ff8b3fe - main - 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/main X-Git-Reftype: branch X-Git-Commit: f4315ff8b3fee71eb0098864a84618f2f8ba85d5 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f4315ff8b3fee71eb0098864a84618f2f8ba85d5 commit f4315ff8b3fee71eb0098864a84618f2f8ba85d5 Author: Olivier Certner AuthorDate: 2025-10-29 16:46:39 +0000 Commit: Olivier Certner CommitDate: 2025-11-02 18:15:30 +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 --- 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);