From owner-svn-src-stable-9@FreeBSD.ORG Mon Mar 11 06:09:09 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AE18ED88; Mon, 11 Mar 2013 06:09:09 +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 0B0CF813; Mon, 11 Mar 2013 06:09:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2B698KO012223; Mon, 11 Mar 2013 06:09:08 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2B698xg012220; Mon, 11 Mar 2013 06:09:08 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201303110609.r2B698xg012220@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 11 Mar 2013 06:09:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r248144 - stable/9/sys/netinet X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 06:09:09 -0000 Author: lstewart Date: Mon Mar 11 06:09:08 2013 New Revision: 248144 URL: http://svnweb.freebsd.org/changeset/base/248144 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/9/sys/netinet/siftr.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/siftr.c ============================================================================== --- stable/9/sys/netinet/siftr.c Mon Mar 11 06:01:00 2013 (r248143) +++ stable/9/sys/netinet/siftr.c Mon Mar 11 06:09:08 2013 (r248144) @@ -1313,7 +1313,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;