Date: Wed, 25 Jul 2012 19:18:28 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r238777 - stable/9/sys/netipsec Message-ID: <201207251918.q6PJIS67091076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Wed Jul 25 19:18:28 2012 New Revision: 238777 URL: http://svn.freebsd.org/changeset/base/238777 Log: MFC r238700: Fix a bug introduced in r221129 that leads to a panic when using bundled SAs. For now allow same address family bundles. PR: kern/164400 Approved by: re (kib) Modified: stable/9/sys/netipsec/ipsec_output.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netipsec/ipsec_output.c ============================================================================== --- stable/9/sys/netipsec/ipsec_output.c Wed Jul 25 17:49:01 2012 (r238776) +++ stable/9/sys/netipsec/ipsec_output.c Wed Jul 25 19:18:28 2012 (r238777) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207251918.q6PJIS67091076>