[src/trunk]: src/sys backout wrong fix as it causes atf net/ipsec/t_ipsec_l2t...

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

details:   https://anonhg.NetBSD.org/src/rev/e8b7844b0f1e
branches:  trunk
changeset: 358164:e8b7844b0f1e
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Fri Dec 15 04:58:31 2017 +0000

description:
backout wrong fix as it causes atf net/ipsec/t_ipsec_l2tp failures.

diffstat:

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

diffs (70 lines):

diff -r efc31b5909ad -r e8b7844b0f1e sys/netinet/in_l2tp.c
--- a/sys/netinet/in_l2tp.c     Fri Dec 15 04:10:49 2017 +0000
+++ b/sys/netinet/in_l2tp.c     Fri Dec 15 04:58:31 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_l2tp.c,v 1.5 2017/12/11 02:17:35 knakahara Exp $    */
+/*     $NetBSD: in_l2tp.c,v 1.6 2017/12/15 04:58:31 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.5 2017/12/11 02:17:35 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.6 2017/12/15 04:58:31 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -368,9 +368,13 @@
 
        KASSERT(proto == IPPROTO_L2TP);
 
-       /* if payload length < 4 octets */
-       if (m->m_len < off + sizeof(uint32_t))
-               return 0;
+       if (m->m_len < 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 efc31b5909ad -r e8b7844b0f1e sys/netinet6/in6_l2tp.c
--- a/sys/netinet6/in6_l2tp.c   Fri Dec 15 04:10:49 2017 +0000
+++ b/sys/netinet6/in6_l2tp.c   Fri Dec 15 04:58:31 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_l2tp.c,v 1.8 2017/12/11 02:17:35 knakahara Exp $   */
+/*     $NetBSD: in6_l2tp.c,v 1.9 2017/12/15 04:58:31 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.8 2017/12/11 02:17:35 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.9 2017/12/15 04:58:31 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -360,9 +360,13 @@
 
        KASSERT(proto == IPPROTO_L2TP);
 
-       /* if payload length < 4 octets */
-       if (m->m_len < off + sizeof(uint32_t))
-               return 0;
+       if (m->m_len < 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);