Date: Mon, 5 Nov 2012 22:54:00 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r242632 - head/sys/netpfil/ipfw Message-ID: <201211052254.qA5Ms0kf009063@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211052254.qA5Ms0kf009063>