svn commit: r235535 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

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) {