From owner-svn-src-all@FreeBSD.ORG  Sun Jul 22 17:46:05 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3DA2106566C;
	Sun, 22 Jul 2012 17:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E8F98FC16;
	Sun, 22 Jul 2012 17:46:05 +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 q6MHk5qm010149;
	Sun, 22 Jul 2012 17:46:05 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MHk57s010147;
	Sun, 22 Jul 2012 17:46:05 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201207221746.q6MHk57s010147@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 22 Jul 2012 17:46:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238700 - head/sys/netipsec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 17:46:05 -0000

Author: bz
Date: Sun Jul 22 17:46:05 2012
New Revision: 238700
URL: http://svn.freebsd.org/changeset/base/238700

Log:
  Fix a bug introduced in r221129 that leads to a panic wen using bundled
  SAs.  For now allow same address family bundles.  While discovered with
  ESP and AH, which does not make a lot of sense, IPcomp could be a possible
  problematic candidate.
  
  PR:		kern/164400
  MFC after:	3 days

Modified:
  head/sys/netipsec/ipsec_output.c

Modified: head/sys/netipsec/ipsec_output.c
==============================================================================
--- head/sys/netipsec/ipsec_output.c	Sun Jul 22 17:31:36 2012	(r238699)
+++ head/sys/netipsec/ipsec_output.c	Sun Jul 22 17:46:05 2012	(r238700)
@@ -165,8 +165,7 @@ ipsec_process_done(struct mbuf *m, struc
 	 */
 	if (isr->next) {
 		V_ipsec4stat.ips_out_bundlesa++;
-		sav = isr->next->sav;
-		saidx = &sav->sah->saidx;
+		/* XXX-BZ currently only support same AF bundles. */
 		switch (saidx->dst.sa.sa_family) {
 #ifdef INET
 		case AF_INET: