From nobody Thu Sep 18 08:52:06 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 4cS8X65sP9z681L1; Thu, 18 Sep 2025 08:52:06 +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 4cS8X640nFz3j4R; Thu, 18 Sep 2025 08:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185526; 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=4/D+o65MezwdysvKWPa+f8gIMWNZ+VWVfQLYIRyM6tI=; b=uGHiwdq4zi3HWR8QyHuCpGwL4LqjtFE5xuHyypBus+7t3qHmWlD1uINtqKGVgHrRHtQp/U q3bS72YaCls8k8jV3cbpATrm1Bv9liIZAMvLVfnCoZluH8R+BUj4g2DrmODfTRuu8W0F59 9EfUWzBSnAVo2+tkz1JrB5Ru65mWGoixWWgjA4zEhFJVVUNDRd1gRBpRCi0bW2rSs/gMHV klBlTg2ZPUt4Oi/3YWyAN2vHwF2fVfFsIRnQAoCREzETSM4MT/LVVqpNjg0Y3FiJW2B3+h 3QPnjTggodRlqy6K0icg0/fN4T2uSP5EsMEKoWvYI/6zu6S4tJauhgc8N2Ql+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185526; 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=4/D+o65MezwdysvKWPa+f8gIMWNZ+VWVfQLYIRyM6tI=; b=XqhigjaeGwrbnHzbetm2tCmJKatdwktaQmw2svebt9l54AS34rwoGDRS9NNxQrUgVNHP+M dlnLItXBQtxJd3mHyJcKocce7mOggpIR7Kui+gSYJ2x7TLRom2EUtlYdqmvMHetsJ5yRP7 uARHvVk3eWUIFXtsEsxGh9NQK7Ip/30c6FEtHq5mFb6dqe8fctb08SAZpKxmCYLCBYMdWT jEqn5rdML49sOduQ3OsED7zjLg+/ULXYmUDaKwGHiExEf+1ABw3Bt/j8TvyaKmuMzDVaRb WijPhZYMb5IWiKfXExB5bpzEWX8hrhYzI3b6V1Z0rgoxqpF0aALyNGtoOsEVlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185526; a=rsa-sha256; cv=none; b=amwRs90KLzz4RbXf1/2PWFmjNCDo9f8sGzYCi8RW0dJ5DRbExpJB+WoN7e4UPcOBe3BcLp zbKZRFpfIl1arUXbr72wtjvliHasta+1TIXJY/CUVbyCHmB+MSfkCex4imIbXhOXZVysW/ 84/fQZEYq7SgNhg7lPzOr8lDsiJ1IORJFVmvoOL6/omordbvsEDpCEGrNV5o3KLYDNXspi KSnwQEQBjWn2kBDWVzry+KCWqydsevsk8AzylVpBozKF6TBBe4KX51vdaLthaRFcuzu3GE /1PTUSZ93oOnh4T0eBku3/tppLzDJ/w9PvID41Su0l43dwOZmZJS+E3J4xwgNA== 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 4cS8X63btxz14bP; Thu, 18 Sep 2025 08:52:06 +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 58I8q6F6018928; Thu, 18 Sep 2025 08:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q6hg018925; Thu, 18 Sep 2025 08:52:06 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:06 GMT Message-Id: <202509180852.58I8q6hg018925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 32606eb5c4dd - stable/15 - 'kern.proc.groups' sysctl knob: Restore outputting the effective GID 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/15 X-Git-Reftype: branch X-Git-Commit: 32606eb5c4ddedc1ad9cf40625ca3f69de19bc24 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=32606eb5c4ddedc1ad9cf40625ca3f69de19bc24 commit 32606eb5c4ddedc1ad9cf40625ca3f69de19bc24 Author: Olivier Certner AuthorDate: 2025-08-26 15:54:47 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:31 +0000 'kern.proc.groups' sysctl knob: Restore outputting the effective GID In particular, fixes 'procstat -s' on a live system (for processes with more than 16 groups). Reviewed by: kib, emaste Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52261 (cherry picked from commit faf7e99375910fadb1b409a756be5477b561a517) --- sys/kern/kern_proc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c2855034fabf..6e56664d12ce 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2944,8 +2944,11 @@ sysctl_kern_proc_groups(SYSCTL_HANDLER_ARGS) cred = crhold(p->p_ucred); PROC_UNLOCK(p); - error = SYSCTL_OUT(req, cred->cr_groups, - cred->cr_ngroups * sizeof(gid_t)); + error = SYSCTL_OUT(req, &cred->cr_gid, sizeof(gid_t)); + if (error == 0) + error = SYSCTL_OUT(req, cred->cr_groups, + cred->cr_ngroups * sizeof(gid_t)); + crfree(cred); return (error); }