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:
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to