From owner-svn-src-projects@FreeBSD.ORG  Tue Aug 12 14:19:45 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F324A3A7
 for <svn-src-projects@freebsd.org>; Tue, 12 Aug 2014 14:19:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C89902648
 for <svn-src-projects@freebsd.org>; Tue, 12 Aug 2014 14:19:45 +0000 (UTC)
Received: from melifaro (uid 1268) (envelope-from melifaro@FreeBSD.org) id 6881
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Tue, 12 Aug 2014 14:19:45 +0000
From: Alexander V. Chernikov <melifaro@FreeBSD.org>
Date: Tue, 12 Aug 2014 14:19:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r269877 - projects/ipfw/sys/netpfil/ipfw
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53ea2281.6881.336678d0@svn.freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Tue, 12 Aug 2014 14:19:46 -0000

Author: melifaro
Date: Tue Aug 12 14:19:45 2014
New Revision: 269877
URL: http://svnweb.freebsd.org/changeset/base/269877

Log:
  Do not use index 0 for tables.

Modified:
  projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c

Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c	Tue Aug 12 14:09:15 2014	(r269876)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c	Tue Aug 12 14:19:45 2014	(r269877)
@@ -2917,7 +2917,7 @@ ipfw_objhash_bitmap_alloc(uint32_t items
 {
 	size_t size;
 	int max_blocks;
-	void *idx_mask;
+	u_long *idx_mask;
 
 	items = roundup2(items, BLOCK_ITEMS);	/* Align to block size */
 	max_blocks = items / BLOCK_ITEMS;
@@ -2925,6 +2925,7 @@ ipfw_objhash_bitmap_alloc(uint32_t items
 	idx_mask = malloc(size * IPFW_MAX_SETS, M_IPFW, M_WAITOK);
 	/* Mark all as free */
 	memset(idx_mask, 0xFF, size * IPFW_MAX_SETS);
+	*idx_mask &= ~(u_long)1; /* Skip index 0 */
 
 	*idx = idx_mask;
 	*pblocks = max_blocks;