From owner-svn-src-projects@FreeBSD.ORG  Wed May 16 12:05:56 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 889EF1065687;
	Wed, 16 May 2012 12:05:56 +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 738B98FC21;
	Wed, 16 May 2012 12:05:56 +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 q4GC5u8S041719;
	Wed, 16 May 2012 12:05:56 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4GC5uGM041717;
	Wed, 16 May 2012 12:05:56 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201205161205.q4GC5uGM041717@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 16 May 2012 12:05:56 +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: r235506 - 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: Wed, 16 May 2012 12:05:56 -0000

Author: glebius
Date: Wed May 16 12:05:55 2012
New Revision: 235506
URL: http://svn.freebsd.org/changeset/base/235506

Log:
  Remove unnecessary locking when checking arguemnts of DIOCADDADDR.

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	Wed May 16 12:00:31 2012	(r235505)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Wed May 16 12:05:55 2012	(r235506)
@@ -2199,22 +2199,18 @@ DIOCGETSTATES_full:
 	case DIOCADDADDR: {
 		struct pfioc_pooladdr	*pp = (struct pfioc_pooladdr *)addr;
 
-		PF_LOCK();
 		if (pp->ticket != V_ticket_pabuf) {
-			PF_UNLOCK();
 			error = EBUSY;
 			break;
 		}
 #ifndef INET
 		if (pp->af == AF_INET) {
-			PF_UNLOCK();
 			error = EAFNOSUPPORT;
 			break;
 		}
 #endif /* INET */
 #ifndef INET6
 		if (pp->af == AF_INET6) {
-			PF_UNLOCK();
 			error = EAFNOSUPPORT;
 			break;
 		}
@@ -2222,17 +2218,12 @@ DIOCGETSTATES_full:
 		if (pp->addr.addr.type != PF_ADDR_ADDRMASK &&
 		    pp->addr.addr.type != PF_ADDR_DYNIFTL &&
 		    pp->addr.addr.type != PF_ADDR_TABLE) {
-			PF_UNLOCK();
 			error = EINVAL;
 			break;
 		}
-		pa = uma_zalloc(V_pf_pooladdr_z, M_NOWAIT);
-		if (pa == NULL) {
-			PF_UNLOCK();
-			error = ENOMEM;
-			break;
-		}
+		pa = uma_zalloc(V_pf_pooladdr_z, M_WAITOK);
 		bcopy(&pp->addr, pa, sizeof(struct pf_pooladdr));
+		PF_LOCK();
 		if (pa->ifname[0]) {
 			pa->kif = pfi_kif_get(pa->ifname);
 			if (pa->kif == NULL) {