From owner-svn-src-projects@FreeBSD.ORG  Thu May 17 08:07:10 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21DEC1065674;
	Thu, 17 May 2012 08:07:10 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D1C18FC17;
	Thu, 17 May 2012 08:07:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4H879Fw085823;
	Thu, 17 May 2012 08:07:09 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4H879sg085821;
	Thu, 17 May 2012 08:07:09 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201205170807.q4H879sg085821@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 17 May 2012 08:07:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235535 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 May 2012 08:07:10 -0000

Author: glebius
Date: Thu May 17 08:07:09 2012
New Revision: 235535
URL: http://svn.freebsd.org/changeset/base/235535

Log:
  Shift V_ticket_pabuf check down under PF_LOCK().
  
  Submitted by:	eri

Modified:
  projects/pf/head/sys/contrib/pf/net/pf_ioctl.c

Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Thu May 17 07:59:15 2012	(r235534)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Thu May 17 08:07:09 2012	(r235535)
@@ -2199,10 +2199,6 @@ DIOCGETSTATES_full:
 	case DIOCADDADDR: {
 		struct pfioc_pooladdr	*pp = (struct pfioc_pooladdr *)addr;
 
-		if (pp->ticket != V_ticket_pabuf) {
-			error = EBUSY;
-			break;
-		}
 #ifndef INET
 		if (pp->af == AF_INET) {
 			error = EAFNOSUPPORT;
@@ -2222,8 +2218,14 @@ DIOCGETSTATES_full:
 			break;
 		}
 		pa = uma_zalloc(V_pf_pooladdr_z, M_WAITOK);
-		bcopy(&pp->addr, pa, sizeof(struct pf_pooladdr));
 		PF_LOCK();
+		if (pp->ticket != V_ticket_pabuf) {
+			PF_UNLOCK();
+			uma_zfree(V_pf_pooladdr_z, pa);
+			error = EBUSY;
+			break;
+		}
+		bcopy(&pp->addr, pa, sizeof(struct pf_pooladdr));
 		if (pa->ifname[0]) {
 			pa->kif = pfi_kif_get(pa->ifname);
 			if (pa->kif == NULL) {