From owner-svn-src-all@FreeBSD.ORG  Sat Dec 13 20:18:05 2008
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D04BD1065688;
	Sat, 13 Dec 2008 20:18:05 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF2F58FC28;
	Sat, 13 Dec 2008 20:18:05 +0000 (UTC)
	(envelope-from kmacy@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 mBDKI5lT038758;
	Sat, 13 Dec 2008 20:18:05 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBDKI5pJ038757;
	Sat, 13 Dec 2008 20:18:05 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812132018.mBDKI5pJ038757@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 13 Dec 2008 20:18:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186053 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 13 Dec 2008 20:18:05 -0000

Author: kmacy
Date: Sat Dec 13 20:18:05 2008
New Revision: 186053
URL: http://svn.freebsd.org/changeset/base/186053

Log:
  radix node head lock needs to be held when calling rnh_addaddr

Modified:
  head/sys/netinet/ip_fw2.c

Modified: head/sys/netinet/ip_fw2.c
==============================================================================
--- head/sys/netinet/ip_fw2.c	Sat Dec 13 20:16:03 2008	(r186052)
+++ head/sys/netinet/ip_fw2.c	Sat Dec 13 20:18:05 2008	(r186053)
@@ -1826,7 +1826,9 @@ add_table_entry(struct ip_fw_chain *ch, 
 	ent->mask.sin_addr.s_addr = htonl(mlen ? ~((1 << (32 - mlen)) - 1) : 0);
 	ent->addr.sin_addr.s_addr = addr & ent->mask.sin_addr.s_addr;
 	IPFW_WLOCK(ch);
+	RADIX_NODE_HEAD_LOCK(rnh);
 	if (rnh->rnh_addaddr(&ent->addr, &ent->mask, rnh, (void *)ent) ==
+	RADIX_NODE_HEAD_UNLOCK(rnh);
 	    NULL) {
 		IPFW_WUNLOCK(ch);
 		free(ent, M_IPFW_TBL);