[src/netbsd-1-6]: src/sys/netinet6 Pull up revision 1.41 (requested by itojun...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/481854efc9ed
branches:  netbsd-1-6
changeset: 530658:481854efc9ed
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Sep 05 21:48:15 2003 +0000

description:
Pull up revision 1.41 (requested by itojun in ticket #1401):
m_cat may free mbuf on 2nd arg, so m_pkthdr manipulation has to happen
before m_cat call.  from Julian Coleman via kame.

diffstat:

 sys/netinet6/ah_input.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 6734c68626a7 -r 481854efc9ed sys/netinet6/ah_input.c
--- a/sys/netinet6/ah_input.c   Fri Sep 05 19:16:20 2003 +0000
+++ b/sys/netinet6/ah_input.c   Fri Sep 05 21:48:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_input.c,v 1.32 2002/03/18 15:30:03 itojun Exp $     */
+/*     $NetBSD: ah_input.c,v 1.32.6.1 2003/09/05 21:48:15 tron Exp $   */
 /*     $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $       */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.32 2002/03/18 15:30:03 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.32.6.1 2003/09/05 21:48:15 tron Exp $");
 
 #include "opt_inet.h"
 
@@ -506,9 +506,9 @@
                                goto fail;
                        }
                        m_adj(n, stripsiz);
-                       m_cat(m, n);
                        /* m_cat does not update m_pkthdr.len */
                        m->m_pkthdr.len += n->m_pkthdr.len;
+                       m_cat(m, n);
                }
 #endif
 
@@ -971,9 +971,9 @@
                                goto fail;
                        }
                        m_adj(n, stripsiz);
-                       m_cat(m, n);
                        /* m_cat does not update m_pkthdr.len */
                        m->m_pkthdr.len += n->m_pkthdr.len;
+                       m_cat(m, n);
                }
 #endif
                ip6 = mtod(m, struct ip6_hdr *);