svn commit: r243940 - head/sys/netpfil/pf

Gleb Smirnoff glebius at FreeBSD.org
Thu Dec 6 08:22:09 UTC 2012


Author: glebius
Date: Thu Dec  6 08:22:08 2012
New Revision: 243940
URL: http://svnweb.freebsd.org/changeset/base/243940

Log:
    Remove extra PFSYNC_LOCK() in pfsync_bulk_update() which lead to lock
  recursion.
  
  Reported by:	Ian FREISLICH <ianf cloudseed.co.za>

Modified:
  head/sys/netpfil/pf/if_pfsync.c

Modified: head/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- head/sys/netpfil/pf/if_pfsync.c	Thu Dec  6 08:15:06 2012	(r243939)
+++ head/sys/netpfil/pf/if_pfsync.c	Thu Dec  6 08:22:08 2012	(r243940)
@@ -2063,9 +2063,7 @@ pfsync_bulk_update(void *arg)
 			if (s->sync_state == PFSYNC_S_NONE &&
 			    s->timeout < PFTM_MAX &&
 			    s->pfsync_time <= sc->sc_ureq_received) {
-				PFSYNC_LOCK(sc);
 				pfsync_update_state_req(s);
-				PFSYNC_UNLOCK(sc);
 				sent++;
 			}
 		}


More information about the svn-src-all mailing list