From nobody Tue Sep 9 15:58:06 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 4cLpPp6YDFz675vh; Tue, 09 Sep 2025 15:58: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 4cLpPp519Jz49Mv; Tue, 09 Sep 2025 15:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757433486; 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=63loAmxKUl/rzEQLN7pHswgBkt4YolqXhdvovl6I1Qo=; b=khUIl0Ql/0tEt4tV4gSMSZh3O3zevOY3xXtN6bgnrXAmtwZ44znLJpVYAAcNLSk4P7Ds+j V0TrlOydSEw2dP0kjthVoRZvLIq/wjF5MsXT+s5+GdbeKlEO7zjZU2XZx/3FfRCvmXtQyJ 76jZ9YElVLDDyaz+6KaQJIss7qrwhBXYoCUxuXPz+274h4iyZTwwIT388NUmsiAaY/HSvt TpbONkXQjhBt6o0HKtHX8WwpXWdu8lt3p0Cwxjl2SLT7C9TQzcgjEMYksCozoBFkVvXBNG REIi6QJ7W40zGKb4oYIVPNqFCzfBuu9RdQROS7KuqKJhyfivU9+3AbxHBovk5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757433486; 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=63loAmxKUl/rzEQLN7pHswgBkt4YolqXhdvovl6I1Qo=; b=tQfE3pLp2T5KGXj9PoU1PJPVfXneY84Ceugrq4Cj4QGw3xx8hGwGv/3urTVv0rVYtosIV9 x+DxYklWUHToQr80xJQgxGCFECyUos2USpn9IRBfVTGutBq9M04xglCLPIrt7birrwsnWS DFhqnuBmHwopIQXNeupW88wZDgTUadhalXTZiGKrj+KcNbi12pptan4wfbJZAwfxZiWqJY l4LtFDkeYl36xWjb110tHmIepwefU0SgTlYZaeXFvdjBCq+t9rUgcs8SWM/k2lA51dv4Rd nBLJyE7tsx4nZDgQf0ZbKSWuP4qLQNTNVUY4aAPNabogYUTX8VzkDIHlIS0NWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757433486; a=rsa-sha256; cv=none; b=xFDcAHuNOOy+QD4zZ78R4wOfSGE3GHrZFxViFWu+N/QxBwdAImTjdL5AaxwQ91sfjsm51A QjztxJ6O1OUXOuSpkHjfC3n94N7ahI2YwE0Py7VDCyl120/VEJz7SzzBySIUoFow0JHlWb Pys8SRCj1p4HokjcVJWwKlLf8uD//m95AFvSvPTO9VmSaNo/soUrv/NhB6jG3uhL7eF4RF n1s/RnsZP6xKeu5Mj9RZ2nuPHeVZBpo7+jyr40oz1FJRctlmVrLQ+DQD6BZx6dieXaYVNR EWmdfwWMGnGati/fLp11BQUlfulXQ1fkSeYrHKEJoSBREtTSwmT/vSC5rns4eg== 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 4cLpPp4YpYzjyk; Tue, 09 Sep 2025 15:58: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 589Fw6lo039509; Tue, 9 Sep 2025 15:58:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589Fw6MC039506; Tue, 9 Sep 2025 15:58:06 GMT (envelope-from git) Date: Tue, 9 Sep 2025 15:58:06 GMT Message-Id: <202509091558.589Fw6MC039506@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: 7676df2faeb6 - main - kvm_proclist(): 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: 7676df2faeb6dcbf20456574dcd2a7f4ab8fff8a Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7676df2faeb6dcbf20456574dcd2a7f4ab8fff8a commit 7676df2faeb6dcbf20456574dcd2a7f4ab8fff8a Author: Olivier Certner AuthorDate: 2025-08-28 14:19:43 +0000 Commit: Olivier Certner CommitDate: 2025-09-09 15:56:49 +0000 kvm_proclist(): Restore outputting the effective GID In particular, fixes 'procstat -s -M' (only if there are less 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/D52260 --- lib/libkvm/kvm_proc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index b2b7c6ecce56..fed483978e62 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -150,13 +150,14 @@ kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p, kp->ki_cr_flags = 0; if (ucred.cr_flags & CRED_FLAG_CAPMODE) kp->ki_cr_flags |= KI_CRF_CAPABILITY_MODE; - if (ucred.cr_ngroups > KI_NGROUPS) { + if (1 + ucred.cr_ngroups > KI_NGROUPS) { kp->ki_ngroups = KI_NGROUPS; kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW; } else - kp->ki_ngroups = ucred.cr_ngroups; - kvm_read(kd, (u_long)ucred.cr_groups, kp->ki_groups, - kp->ki_ngroups * sizeof(gid_t)); + kp->ki_ngroups = 1 + ucred.cr_ngroups; + kp->ki_groups[0] = ucred.cr_gid; + kvm_read(kd, (u_long)ucred.cr_groups, kp->ki_groups + 1, + (kp->ki_ngroups - 1) * sizeof(gid_t)); if (ucred.cr_prison != NULL) { if (KREAD(kd, (u_long)ucred.cr_prison, &pr)) { _kvm_err(kd, kd->program,