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

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

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

description:
Pull up revision 1.33 (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/esp_input.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 481854efc9ed -r ef6ee4d4e454 sys/netinet6/esp_input.c
--- a/sys/netinet6/esp_input.c  Fri Sep 05 21:48:15 2003 +0000
+++ b/sys/netinet6/esp_input.c  Fri Sep 05 21:48:25 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_input.c,v 1.21.6.3 2003/07/10 15:47:36 tron Exp $  */
+/*     $NetBSD: esp_input.c,v 1.21.6.4 2003/09/05 21:48:25 tron Exp $  */
 /*     $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $      */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.21.6.3 2003/07/10 15:47:36 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.21.6.4 2003/09/05 21:48:25 tron Exp $");
 
 #include "opt_inet.h"
 
@@ -855,9 +855,9 @@
                                goto bad;
                        }
                        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);
                }
 
 #ifndef PULLDOWN_TEST