From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  5 17:20:19 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 89CFE1065672;
	Fri,  5 Jun 2009 17:20:19 +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 78B368FC16;
	Fri,  5 Jun 2009 17:20:19 +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 n55HKJB2032552;
	Fri, 5 Jun 2009 17:20:19 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55HKJo7032551;
	Fri, 5 Jun 2009 17:20:19 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200906051720.n55HKJo7032551@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 5 Jun 2009 17:20:19 +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: r193525 - projects/ngroups/sys/netinet
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: Fri, 05 Jun 2009 17:20:19 -0000

Author: brooks
Date: Fri Jun  5 17:20:19 2009
New Revision: 193525
URL: http://svn.freebsd.org/changeset/base/193525

Log:
  Clamp the number of groups ipfw can track to 16 for now.

Modified:
  projects/ngroups/sys/netinet/ip_fw2.c

Modified: projects/ngroups/sys/netinet/ip_fw2.c
==============================================================================
--- projects/ngroups/sys/netinet/ip_fw2.c	Fri Jun  5 17:19:55 2009	(r193524)
+++ projects/ngroups/sys/netinet/ip_fw2.c	Fri Jun  5 17:20:19 2009	(r193525)
@@ -140,8 +140,9 @@ static uma_zone_t ipfw_dyn_rule_zone;
  * the user specified UID/GID based constraints in
  * a firewall rule.
  */
+#define FW_NGROUPS	16
 struct ip_fw_ugid {
-	gid_t		fw_groups[NGROUPS];
+	gid_t		fw_groups[FW_NGROUPS];	/* XXX: should be dynamic */
 	int		fw_ngroups;
 	uid_t		fw_uid;
 	int		fw_prid;
@@ -2017,8 +2018,8 @@ fill_ugid_cache(struct inpcb *inp, struc
 	cr = inp->inp_cred;
 	ugp->fw_prid = jailed(cr) ? cr->cr_prison->pr_id : -1;
 	ugp->fw_uid = cr->cr_uid;
-	ugp->fw_ngroups = cr->cr_ngroups;
-	bcopy(cr->cr_groups, ugp->fw_groups, sizeof(ugp->fw_groups));
+	ugp->fw_ngroups = MIN(cr->cr_ngroups, FW_NGROUPS);
+	bcopy(cr->cr_groups, ugp->fw_groups, sizeof(gid_t) * ugp->fw_ngroups);
 }
 
 static int