[src/trunk]: src/sys backout wrong fix again, sorry.

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

details:   https://anonhg.NetBSD.org/src/rev/57fb263ce2d5
branches:  trunk
changeset: 828521:57fb263ce2d5
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Dec 18 03:20:12 2017 +0000

description:
backout wrong fix again, sorry.

diffstat:

 sys/netinet/in_l2tp.c   |  12 +++++++-----
 sys/netinet6/in6_l2tp.c |  12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diffs (68 lines):

diff -r 3a5e10101d42 -r 57fb263ce2d5 sys/netinet/in_l2tp.c
--- a/sys/netinet/in_l2tp.c     Mon Dec 18 00:33:32 2017 +0000
+++ b/sys/netinet/in_l2tp.c     Mon Dec 18 03:20:12 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_l2tp.c,v 1.7 2017/12/15 05:01:16 knakahara Exp $    */
+/*     $NetBSD: in_l2tp.c,v 1.8 2017/12/18 03:20:12 knakahara Exp $    */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.7 2017/12/15 05:01:16 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.8 2017/12/18 03:20:12 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -369,10 +369,12 @@
        KASSERT(proto == IPPROTO_L2TP);
 
        if (m->m_len < off + sizeof(uint32_t)) {
-               /* if payload length < 4 octets */
-               if(!m_ensure_contig(&m, off + sizeof(uint32_t)))
+               m = m_pullup(m, off + sizeof(uint32_t));
+               if (!m) {
+                       /* if payload length < 4 octets */
                        return 0;
-       }
+               }
+        }
 
        /* get L2TP session ID */
        m_copydata(m, off, sizeof(uint32_t), (void *)&sess_id);
diff -r 3a5e10101d42 -r 57fb263ce2d5 sys/netinet6/in6_l2tp.c
--- a/sys/netinet6/in6_l2tp.c   Mon Dec 18 00:33:32 2017 +0000
+++ b/sys/netinet6/in6_l2tp.c   Mon Dec 18 03:20:12 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_l2tp.c,v 1.10 2017/12/15 05:01:16 knakahara Exp $  */
+/*     $NetBSD: in6_l2tp.c,v 1.11 2017/12/18 03:20:13 knakahara Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.10 2017/12/15 05:01:16 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.11 2017/12/18 03:20:13 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -361,10 +361,12 @@
        KASSERT(proto == IPPROTO_L2TP);
 
        if (m->m_len < off + sizeof(uint32_t)) {
-               /* if payload length < 4 octets */
-               if(!m_ensure_contig(&m, off + sizeof(uint32_t)))
+               m = m_pullup(m, off + sizeof(uint32_t));
+               if (!m) {
+                       /* if payload length < 4 octets */
                        return 0;
-       }
+               }
+        }
 
        /* get L2TP session ID */
        m_copydata(m, off, sizeof(uint32_t), (void *)&sess_id);