From owner-p4-projects@FreeBSD.ORG  Fri Sep 26 16:20:04 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92C0016A4C0; Fri, 26 Sep 2003 16:20:04 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 68B8416A4B3
	for <perforce@freebsd.org>; Fri, 26 Sep 2003 16:20:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E1F9044015
	for <perforce@freebsd.org>; Fri, 26 Sep 2003 16:20:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8QNK2XJ060838
	for <perforce@freebsd.org>; Fri, 26 Sep 2003 16:20:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8QNK2LV060835
	for perforce@freebsd.org; Fri, 26 Sep 2003 16:20:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Fri, 26 Sep 2003 16:20:02 -0700 (PDT)
Message-Id: <200309262320.h8QNK2LV060835@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38685 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Sep 2003 23:20:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=38685

Change 38685 by sam@sam_ebb on 2003/09/26 16:19:47

	fix locking for bundled SA's and for when key exchange is required

Affected files ...

.. //depot/projects/netperf/sys/netipsec/ipsec_output.c#6 edit

Differences ...

==== //depot/projects/netperf/sys/netipsec/ipsec_output.c#6 (text+ko) ====

@@ -204,6 +204,7 @@
 	struct secasvar *sav;
 
 	IPSEC_SPLASSERT_SOFTNET(__func__);
+	IPSECREQUEST_LOCK_ASSERT(isr);
 
 	IPSEC_ASSERT(af == AF_INET || af == AF_INET6,
 		("invalid address family %u", af));
@@ -287,12 +288,14 @@
 		IPSEC_ASSERT(ipsec_get_reqlevel(isr) == IPSEC_LEVEL_USE,
 			("no SA found, but required; level %u",
 			ipsec_get_reqlevel(isr)));
+		IPSECREQUEST_UNLOCK(isr);
 		isr = isr->next;
 		if (isr == NULL) {
 			/*XXXstatistic??*/
 			*error = EINVAL;		/*XXX*/
 			return isr;
 		}
+		IPSECREQUEST_LOCK(isr);
 		goto again;
 	}
 
@@ -324,6 +327,7 @@
 	return isr;
 bad:
 	IPSEC_ASSERT(*error != 0, ("error return w/ no error code"));
+	IPSECREQUEST_UNLOCK(isr);
 	return NULL;
 #undef IPSEC_OSTAT
 }
@@ -469,7 +473,8 @@
 	IPSECREQUEST_UNLOCK(isr);
 	return error;
 bad:
-	IPSECREQUEST_UNLOCK(isr);
+	if (isr)
+		IPSECREQUEST_UNLOCK(isr);
 	if (m)
 		m_freem(m);
 	return error;