From nobody Thu Sep 18 08:52:05 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 4cS8X601SSz681qt; 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 4cS8X53RkTz3jHQ; Thu, 18 Sep 2025 08:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185525; 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=6AwYvFwkkA017zmrk5/NcaXeME1Jf6JFL1rdhtX3YAg=; b=dy6Hxd9BiguFzcADplmgLX2byPoN4KASkl+A5mn33Rxe183KFIz8gW0AH8ZQUJHKeE8YFe jtBKe2cdVU1auFNX1SUPBheVJA6KrNBFztlreIrr2+FhPyuduer54vd+xKeMfT8tRMfLM2 YDs7WvyppMsEBhOFUhZ4h9bsCAyvXs8ttvkOr6imFcPBm/s48hCDTHxvYP0kOW0SNRnqPb dU4BBStzDun8Yx/gbPHepBYr4cqrn2ywgkZSqQkQafZq7P47URvWD1dYMUI+twKAmte6Tb g693MZzrYdwC3W815jIIfpzei62qeyrhzHGiCfOeRoQPz+qBPHyfbDOLW84y7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185525; 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=6AwYvFwkkA017zmrk5/NcaXeME1Jf6JFL1rdhtX3YAg=; b=S2w2xVJHkVSZXHujNq4gKuZkj3wsTySBQDksnviCwXWNJAA9PsyE4sbkOAMvme8oMpVmz5 KBD7C2QWUAkpQK2/qeY01twpy7tnmQVpRPbWstw/HMsfXaqynfckRxSb2KGnDNQOO+Jl+b 7yae57gk/duVblKwaiD0PKsOGy32+poJYx1ieqOLcYTA1v3jTZe49BO5wHaELg3YKFKXGC KHtp9LGCQRbjNuIW6FEMDymaYByh9qBv1LNqefVevOwl9PVh7vyRef9RKP4IocNk2TzoMs f6J+zPG4Ce91BVxS4v6NLMbtCKIuegM3w+TV9B7rL05dbfiks1juZheBGp10Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185525; a=rsa-sha256; cv=none; b=sPXZLhF/5XJKoE/iXGykUGhrx7AAB5fpZXtlfpnjQ8eG4TM5IOeV5hoxtbtQzfnOdCX9D/ 6c0hBbyKbuFyzlTKITM9qNuQ1GUNnzrIiRNbONVQiFch6nHrJqIOYVySP1ThJOySaVCuxr l8qL6MLCBCwVpYlETt5q3rCtfDQyoBMkOxATYA75Mi6+MRYiOXxECDxkRRDxtPOPvvJeXp diAQlHhIJjHzl1UfaFIEUDypxE/QLzcupoMUYGUEmZ75QCfhT8kRiZ4s41gxDnXa6sc4XQ RzOuyJZHjV3zNg11SR2wK3iGmkRVVp5kz5Ok0hDU0Poka5TKSM9b9NCwKhTRWQ== 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 4cS8X52x0Vz14L6; Thu, 18 Sep 2025 08:52: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 58I8q59r018893; Thu, 18 Sep 2025 08:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q5LT018889; Thu, 18 Sep 2025 08:52:05 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:05 GMT Message-Id: <202509180852.58I8q5LT018889@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: 53a9f161903d - stable/15 - kvm_proclist(): 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: 53a9f161903d1cc9e0dc11be79a5c84735ab33da Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=53a9f161903d1cc9e0dc11be79a5c84735ab33da commit 53a9f161903d1cc9e0dc11be79a5c84735ab33da Author: Olivier Certner AuthorDate: 2025-08-28 14:19:43 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:30 +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 (cherry picked from commit 7676df2faeb6dcbf20456574dcd2a7f4ab8fff8a) --- 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,