From owner-svn-src-head@FreeBSD.ORG  Mon Nov  5 22:54:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 91EDE632;
 Mon,  5 Nov 2012 22:54:00 +0000 (UTC)
 (envelope-from melifaro@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 7562E8FC12;
 Mon,  5 Nov 2012 22:54:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5Ms0h1009066;
 Mon, 5 Nov 2012 22:54:00 GMT (envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5Ms0kf009063;
 Mon, 5 Nov 2012 22:54:00 GMT (envelope-from melifaro@svn.freebsd.org)
Message-Id: <201211052254.qA5Ms0kf009063@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Mon, 5 Nov 2012 22:54:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242632 - head/sys/netpfil/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 22:54:00 -0000

Author: melifaro
Date: Mon Nov  5 22:54:00 2012
New Revision: 242632
URL: http://svnweb.freebsd.org/changeset/base/242632

Log:
  Add assertion to enforce 'nat global' locking requierements changed by r241908.
  
  Suggested by:	adrian, glebius
  MFC after:	3 days

Modified:
  head/sys/netpfil/ipfw/ip_fw_nat.c
  head/sys/netpfil/ipfw/ip_fw_private.h

Modified: head/sys/netpfil/ipfw/ip_fw_nat.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_nat.c	Mon Nov  5 22:30:56 2012	(r242631)
+++ head/sys/netpfil/ipfw/ip_fw_nat.c	Mon Nov  5 22:54:00 2012	(r242632)
@@ -276,6 +276,7 @@ ipfw_nat(struct ip_fw_args *args, struct
 
 		found = 0;
 		chain = &V_layer3_chain;
+		IPFW_RLOCK_ASSERT(chain);
 		/* Check every nat entry... */
 		LIST_FOREACH(t, &chain->nat, _next) {
 			if ((t->mode & PKT_ALIAS_SKIP_GLOBAL) != 0)

Modified: head/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_private.h	Mon Nov  5 22:30:56 2012	(r242631)
+++ head/sys/netpfil/ipfw/ip_fw_private.h	Mon Nov  5 22:54:00 2012	(r242632)
@@ -251,6 +251,7 @@ struct sockopt;	/* used by tcp_var.h */
 	rw_destroy(&(_chain)->uh_lock);			\
 	} while (0)
 
+#define	IPFW_RLOCK_ASSERT(_chain)	rw_assert(&(_chain)->rwmtx, RA_RLOCKED)
 #define	IPFW_WLOCK_ASSERT(_chain)	rw_assert(&(_chain)->rwmtx, RA_WLOCKED)
 
 #define IPFW_RLOCK(p) rw_rlock(&(p)->rwmtx)