svn commit: r226623 - head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Fri Oct 21 22:28:15 2011
New Revision: 226623
URL: http://svn.freebsd.org/changeset/base/226623

Log:
  Fix a race: we should update sc_len before dropping the pf lock, otherwise a
  number of packets can be queued on sc, while we are in ip_output(), and then
  we wipe the accumulated sc_len. On next pfsync_sendout() that would lead to
  writing beyond our mbuf cluster.

Modified:
  head/sys/contrib/pf/net/if_pfsync.c

Modified: head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- head/sys/contrib/pf/net/if_pfsync.c	Fri Oct 21 22:12:24 2011	(r226622)
+++ head/sys/contrib/pf/net/if_pfsync.c	Fri Oct 21 22:28:15 2011	(r226623)
@@ -2354,6 +2354,7 @@ pfsync_sendout(void)
 	sc->sc_if.if_obytes += m->m_pkthdr.len;
 #endif
 
+	sc->sc_len = PFSYNC_MINPKT;
 #ifdef __FreeBSD__
 	PF_UNLOCK();
 #endif
@@ -2375,9 +2376,6 @@ pfsync_sendout(void)
 #ifdef __FreeBSD__
 	}
 #endif
-
-	/* start again */
-	sc->sc_len = PFSYNC_MINPKT;
 }
 
 void