From owner-p4-projects@FreeBSD.ORG  Fri Sep 26 16:21:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B79AF16A4C1; Fri, 26 Sep 2003 16:21:08 -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 8C57816A4B3
	for <perforce@freebsd.org>; Fri, 26 Sep 2003 16:21:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D87BA44028
	for <perforce@freebsd.org>; Fri, 26 Sep 2003 16:21:04 -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 h8QNL4XJ060958
	for <perforce@freebsd.org>; Fri, 26 Sep 2003 16:21:04 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8QNL4jt060955
	for perforce@freebsd.org; Fri, 26 Sep 2003 16:21:04 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Fri, 26 Sep 2003 16:21:04 -0700 (PDT)
Message-Id: <200309262321.h8QNL4jt060955@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 38686 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:21:09 -0000

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

Change 38686 by sam@sam_ebb on 2003/09/26 16:20:51

	move iv free'ing to where it is allocated; this also corrects
	a malloc type mismatch that (in 4.x) made folks think there was
	a memory leak ('cuz memory was allocated to one bucket but free'd
	to another)

Affected files ...

.. //depot/projects/netperf/sys/netipsec/key.c#8 edit
.. //depot/projects/netperf/sys/netipsec/xform_esp.c#6 edit

Differences ...

==== //depot/projects/netperf/sys/netipsec/key.c#8 (text+ko) ====

@@ -2772,6 +2772,7 @@
 		sav->tdb_xform->xf_zeroize(sav);
 		sav->tdb_xform = NULL;
 	} else {
+		KASSERT(sav->iv == NULL, ("iv but no xform"));
 		if (sav->key_auth != NULL)
 			bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
 		if (sav->key_enc != NULL)
@@ -2806,10 +2807,6 @@
 		free(sav->lft_s, M_IPSEC_MISC);
 		sav->lft_s = NULL;
 	}
-	if (sav->iv != NULL) {
-		free(sav->iv, M_IPSEC_MISC);
-		sav->iv = NULL;
-	}
 }
 
 /*

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

@@ -249,7 +249,10 @@
 
 	if (sav->key_enc)
 		bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc));
-	/* NB: sav->iv is freed elsewhere, even though we malloc it! */
+	if (sav->iv) {
+		free(sav->iv, M_XDATA);
+		sav->iv = NULL;
+	}
 	sav->tdb_encalgxform = NULL;
 	sav->tdb_xform = NULL;
 	return error;