From owner-svn-src-all@FreeBSD.ORG  Mon Mar 11 06:17:47 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3F3E4F59;
 Mon, 11 Mar 2013 06:17:47 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 316B584F;
 Mon, 11 Mar 2013 06:17:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2B6HlCO015078;
 Mon, 11 Mar 2013 06:17:47 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2B6HlMq015076;
 Mon, 11 Mar 2013 06:17:47 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201303110617.r2B6HlMq015076@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Mon, 11 Mar 2013 06:17:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r248145 - stable/7/sys/netinet
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Mar 2013 06:17:47 -0000

Author: lstewart
Date: Mon Mar 11 06:17:46 2013
New Revision: 248145
URL: http://svnweb.freebsd.org/changeset/base/248145

Log:
  MFC r247906:
  
  The hashmask returned by hashinit() is a valid index in the returned hash array.
  Fix a siftr(4) potential memory leak and INVARIANTS triggered kernel panic in
  hashdestroy() by ensuring the last array index in the flow counter hash table is
  flushed of entries.

Modified:
  stable/7/sys/netinet/siftr.c
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/netinet/siftr.c
==============================================================================
--- stable/7/sys/netinet/siftr.c	Mon Mar 11 06:09:08 2013	(r248144)
+++ stable/7/sys/netinet/siftr.c	Mon Mar 11 06:17:46 2013	(r248145)
@@ -1316,7 +1316,7 @@ siftr_manage_ops(uint8_t action)
 		 * flow seen and freeing any malloc'd memory.
 		 * The hash consists of an array of LISTs (man 3 queue).
 		 */
-		for (i = 0; i < siftr_hashmask; i++) {
+		for (i = 0; i <= siftr_hashmask; i++) {
 			LIST_FOREACH_SAFE(counter, counter_hash + i, nodes,
 			    tmp_counter) {
 				key = counter->key;