Date: Thu, 6 Dec 2012 08:22:08 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243940 - head/sys/netpfil/pf Message-ID: <201212060822.qB68M8Ur097907@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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++; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212060822.qB68M8Ur097907>