From nobody Thu Sep 18 08:52:04 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 4cS8X45JLkz681lc; Thu, 18 Sep 2025 08:52:04 +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 4cS8X42Lvdz3j6M; Thu, 18 Sep 2025 08:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185524; 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=U58z8+1hLNa4QGwTnF1DJmiXU+MPpnAYxsF664dh5mo=; b=pujvvdSxnEdkv77RUSKCkEQ0XMz3Iv91ffJT9H0XjezyNsKYvfUR5tSOMUBbSand4/xqxM Svg2fZ3HvuvKacmFWZPSHEe2tHaUNzG7ukXc4LRgqshx6ldJFk6ziGw0Rrp90CwZ65A/P0 ijNVLYEXMKT7tVCIJksFr5tLmu6PFKxsS8/MdU2ZtDhLXC92BCo/qysjZeff2NMAjxvqV2 k6ACpF3W7d5r24uhm8A0HFLzh7XZUbdiKcxDMpHck5//Bkfk+mOYeFzq6m5ifVSgpjX9+f HlavvffvCcvVSalqGqlDPv/MH32Ey2zitz2l4LpOEjyTM9YxFuLSOlDbbS5P1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185524; 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=U58z8+1hLNa4QGwTnF1DJmiXU+MPpnAYxsF664dh5mo=; b=IeenQ3zo1UOKl6fGURWWwjKF9LPjB3I6v7MfUpPjm//QaWHEa9N5Ttwg62bczcol7n/MMS UmTPKHKLnWgANruyVYeD8JIFoQ11ev/A9wN9GyswsfAkvg41N02tBoT7u+wJn/CGBC86nF ffj/xWawWy8ONPtOQ4dv08clEZs0oFrO65cqCaxwtf0oh8yPraYcnR0iBxlTY7e75JlLLn cZvzSI2WQ7qzJ9vZUBIwFRGeIQw+a+M7cktzBZSbawUo2+EzamsHMxeuf+sYEleb9vQuS2 t6gNMIV1lyo46ric629qmHTUK928GraGidwQKjjhS0RdQY5bso4afJfrFHPlgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185524; a=rsa-sha256; cv=none; b=mAXxkPWx2AAqzWNVp8ojnWS8OjcEogcWnOY4qaGS/TOlZK6cX+vhrLdNmR7OBacHgfMdwb 90H44zo17cLz5smh4qN0BPGd+/WFbYFzT/KIUUBw+aCc0r7tCcWrdrqCNZNU24OMmxVjwq wfm6r+U0tZ8ULaIlP/+nWlHc3hQatxBXXNIBrWhTPKb0j8bAY/iRU/Ui67pv3w/f9RM/8D Of66ZH1s7n4srh5bUF5yisViIaK7EccgsuXbXH6zKWR0W/J0R72QRkFs62cbKZnCK5Vxd1 uhuFix/NcgSjiYhICoFbJUQ7Ffk4IJ8Q0xPDHtiE+JDCgOK6Vsrh22naYwEEpA== 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 4cS8X41wtyz14YW; Thu, 18 Sep 2025 08:52:04 +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 58I8q4b4018859; Thu, 18 Sep 2025 08:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q4oX018856; Thu, 18 Sep 2025 08:52:04 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:04 GMT Message-Id: <202509180852.58I8q4oX018856@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: 74d3fdf040c0 - stable/15 - kinfo_proc: 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: 74d3fdf040c07116533fca2551a473e959d76c27 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=74d3fdf040c07116533fca2551a473e959d76c27 commit 74d3fdf040c07116533fca2551a473e959d76c27 Author: Olivier Certner AuthorDate: 2025-08-26 13:53:06 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:30 +0000 kinfo_proc: Restore outputting the effective GID In particular, fixes 'procstat -s' on a live system or a core file (only if there are less than 16 groups). Reviewed by: kib 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/D52259 (cherry picked from commit 63a40ca813a9995e8e2dee0142297d9c38106c05) --- sys/kern/kern_proc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 379fbda619c0..c2855034fabf 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1112,13 +1112,14 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp) if (cred->cr_flags & CRED_FLAG_CAPMODE) kp->ki_cr_flags |= KI_CRF_CAPABILITY_MODE; /* XXX bde doesn't like KI_NGROUPS */ - if (cred->cr_ngroups > KI_NGROUPS) { + if (1 + cred->cr_ngroups > KI_NGROUPS) { kp->ki_ngroups = KI_NGROUPS; kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW; } else - kp->ki_ngroups = cred->cr_ngroups; - bcopy(cred->cr_groups, kp->ki_groups, - kp->ki_ngroups * sizeof(gid_t)); + kp->ki_ngroups = 1 + cred->cr_ngroups; + kp->ki_groups[0] = cred->cr_gid; + bcopy(cred->cr_groups, kp->ki_groups + 1, + (kp->ki_ngroups - 1) * sizeof(gid_t)); kp->ki_rgid = cred->cr_rgid; kp->ki_svgid = cred->cr_svgid; /* If jailed(cred), emulate the old P_JAILED flag. */