summaryrefslogtreecommitdiffstats
path: root/sys/netpfil
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2012-12-06 08:22:08 +0000
committerglebius <glebius@FreeBSD.org>2012-12-06 08:22:08 +0000
commit9fc690ed34bec6f3761b5d37ec332e924aaee3ec (patch)
tree0048e50d7cf5d6b1012ab1021248e267f9e70b1f /sys/netpfil
parent4cf66ea4437a36ca625969d60e8dac3c46d93711 (diff)
downloadFreeBSD-src-9fc690ed34bec6f3761b5d37ec332e924aaee3ec.zip
FreeBSD-src-9fc690ed34bec6f3761b5d37ec332e924aaee3ec.tar.gz
Remove extra PFSYNC_LOCK() in pfsync_bulk_update() which lead to lock
recursion. Reported by: Ian FREISLICH <ianf cloudseed.co.za>
Diffstat (limited to 'sys/netpfil')
-rw-r--r--sys/netpfil/pf/if_pfsync.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index beb88cd..a0d04fe 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -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++;
}
}
OpenPOWER on IntegriCloud