From nobody Tue Sep 9 15:58:05 2025 X-Original-To: dev-commits-src-main@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 4cLpPn5pmfz675q7; Tue, 09 Sep 2025 15:58:05 +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 4cLpPn40TBz48v2; Tue, 09 Sep 2025 15:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757433485; 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=nH66DwzB/7W04ukv/Dz7j3/uwc8gszMLX0RD9ejUHbI=; b=T+MtW0ONar0AC68rx7K1JquVhLkGRWD9IrLkwIFp5tqhDqje3QvHFvCP9wxlCbIRZo+TZA 79trvPFV1w58GQuS63deUDYeY1049iOl7NujO5Swc8u9E0SHNeH7EHGDPZlZMPLbpQLsLA DhcIKIGeDYyAk4OXW7pxEmR7k9Fe970d8cH3HXEb6NsCpeuxZ+tp9s1Daj+LWHwFhbVm66 PtN6P7dRGKYi5z7fH+fCX61bi/JNiTDfV24PREsX+t6FdIniaBEXcvkVWTEvSI1n5Nxvxm njpdSJqLcEW6znJB69d5rXWu011g1kRzkxeAOvmUFEd14I1JnCf6N8Cwy4Bo5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757433485; 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=nH66DwzB/7W04ukv/Dz7j3/uwc8gszMLX0RD9ejUHbI=; b=gk3gGzAzVAFbuq5i3gTdPtIXUNt+1zDROymKshlpQ3sNgfu4u+77QwIrf70f8cd/AXZTZY uL/MC+gf+OWPAxWsc+hBP9OkVyCY/U7BM/+QLhFF45BRYYaNUvLFWorian2Ah/tnD/MJIY TUejhc4+ptyfwUvQvUeb0WgVwIfdKjlStTzhdHJloJIkyMRw2/s4QqNbq7YYxnV9w3R9Sa MNQK4w/w5cZ30xN1mHJLFO5joe56zc4QqjB4wzJlqGxw684XG2sZgRXgiwhgCwZzWz6UAu HYY50nYyiV5X3P7R4N9NolO+qQXPNbDXyXEsSQHbBKO8UFgHhL6AUz1lh2WzYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757433485; a=rsa-sha256; cv=none; b=auHapmvUws12rgl4Nm2rfZ/XzsRd6rZXjgfosKGtfUWbBW8ngjXK1HQMcwq6e5Ri4IKUBy R843UcS/V7+dQPElA3zDxvhEROAje9SDbU6VnqN/ehky/T35cZUvpnpCdfYC4OR2QpyKgu 0eqztdECe0inajrR+k678oh8fNydZldnoJUpZ5SfgttfVcELyRMi+S11uYKPnaigGVOIyk 2r3qMfKmbkHp0hAdPVgnEd9wXbjo0SqHc60VMV8Gz8nXrQoovRlZqkQIH8o5MfnYiq9xQj jAon8BoXnsfxpX2JkngJucZienwY7oBuH4v5+nuTDMuGPiuicOt5p4bgpFpS3g== 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 4cLpPn3cP6zjyj; Tue, 09 Sep 2025 15:58:05 +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 589Fw594039473; Tue, 9 Sep 2025 15:58:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589Fw5oJ039470; Tue, 9 Sep 2025 15:58:05 GMT (envelope-from git) Date: Tue, 9 Sep 2025 15:58:05 GMT Message-Id: <202509091558.589Fw5oJ039470@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: 63a40ca813a9 - main - kinfo_proc: Restore outputting the effective GID List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 63a40ca813a9995e8e2dee0142297d9c38106c05 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=63a40ca813a9995e8e2dee0142297d9c38106c05 commit 63a40ca813a9995e8e2dee0142297d9c38106c05 Author: Olivier Certner AuthorDate: 2025-08-26 13:53:06 +0000 Commit: Olivier Certner CommitDate: 2025-09-09 15:56:49 +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 --- 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. */