From owner-svn-src-head@FreeBSD.ORG  Thu Dec  6 08:22:09 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3F8742C0;
 Thu,  6 Dec 2012 08:22:09 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 21C0C8FC16;
 Thu,  6 Dec 2012 08:22:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB68M8aU097908;
 Thu, 6 Dec 2012 08:22:09 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB68M8Ur097907;
 Thu, 6 Dec 2012 08:22:08 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212060822.qB68M8Ur097907@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 6 Dec 2012 08:22:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243940 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2012 08:22:09 -0000

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++;
 			}
 		}