From owner-svn-src-projects@FreeBSD.ORG  Thu May 14 03:54:04 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53CF6106564A;
	Thu, 14 May 2009 03:54:04 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 420CF8FC12;
	Thu, 14 May 2009 03:54:04 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4E3s4Yr076418;
	Thu, 14 May 2009 03:54:04 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4E3s4Op076417;
	Thu, 14 May 2009 03:54:04 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200905140354.n4E3s4Op076417@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 14 May 2009 03:54:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192084 - projects/ngroups/lib/libkvm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2009 03:54:04 -0000

Author: brooks
Date: Thu May 14 03:54:03 2009
New Revision: 192084
URL: http://svn.freebsd.org/changeset/base/192084

Log:
  Only copy as many groups from cr_groups to ki_groups as will fit.
  Truncate if there are too many.

Modified:
  projects/ngroups/lib/libkvm/kvm_proc.c

Modified: projects/ngroups/lib/libkvm/kvm_proc.c
==============================================================================
--- projects/ngroups/lib/libkvm/kvm_proc.c	Thu May 14 03:51:53 2009	(r192083)
+++ projects/ngroups/lib/libkvm/kvm_proc.c	Thu May 14 03:54:03 2009	(r192084)
@@ -147,7 +147,8 @@ kvm_proclist(kd, what, arg, p, bp, maxcn
 			kp->ki_svgid = ucred.cr_svgid;
 			kp->ki_ngroups = ucred.cr_ngroups;
 			bcopy(ucred.cr_groups, kp->ki_groups,
-			    NGROUPS * sizeof(gid_t));
+			    (NGROUPS < KI_NGROUPS ? NGROUPS : KI_NGROUPS) *
+			    sizeof(gid_t));
 			kp->ki_uid = ucred.cr_uid;
 			if (ucred.cr_prison != NULL) {
 				if (KREAD(kd, (u_long)ucred.cr_prison, &pr)) {