From owner-svn-src-stable-8@FreeBSD.ORG  Fri May  6 13:12:45 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A381A106564A;
	Fri,  6 May 2011 13:12:45 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92AF58FC16;
	Fri,  6 May 2011 13:12:45 +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 p46DCj25049444;
	Fri, 6 May 2011 13:12:45 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p46DCj1e049441;
	Fri, 6 May 2011 13:12:45 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201105061312.p46DCj1e049441@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Fri, 6 May 2011 13:12:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221524 - stable/8/sys/netipsec
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2011 13:12:45 -0000

Author: fabient
Date: Fri May  6 13:12:45 2011
New Revision: 221524
URL: http://svn.freebsd.org/changeset/base/221524

Log:
  MFC r220194:
  Fix two SA refcount:
   - AH does not release the SA like in ESP/IPCOMP when handling EAGAIN
   - ipsec_process_done incorrectly release the SA.

Modified:
  stable/8/sys/netipsec/ipsec_output.c
  stable/8/sys/netipsec/xform_ah.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netipsec/ipsec_output.c
==============================================================================
--- stable/8/sys/netipsec/ipsec_output.c	Fri May  6 13:11:50 2011	(r221523)
+++ stable/8/sys/netipsec/ipsec_output.c	Fri May  6 13:12:45 2011	(r221524)
@@ -247,7 +247,6 @@ ipsec_process_done(struct mbuf *m, struc
 	panic("ipsec_process_done");
 bad:
 	m_freem(m);
-	KEY_FREESAV(&sav);
 	return (error);
 }
 

Modified: stable/8/sys/netipsec/xform_ah.c
==============================================================================
--- stable/8/sys/netipsec/xform_ah.c	Fri May  6 13:11:50 2011	(r221523)
+++ stable/8/sys/netipsec/xform_ah.c	Fri May  6 13:12:45 2011	(r221524)
@@ -785,6 +785,7 @@ ah_input_cb(struct cryptop *crp)
 			sav->tdb_cryptoid = crp->crp_sid;
 
 		if (crp->crp_etype == EAGAIN) {
+			KEY_FREESAV(&sav);
 			error = crypto_dispatch(crp);
 			return error;
 		}