[src/trunk]: src/sys fix pullup'ed mbuf leaks. pointed out by maxv@n.o, thanks.

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

details:   https://anonhg.NetBSD.org/src/rev/6a2470cd64b2
branches:  trunk
changeset: 828395:6a2470cd64b2
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Dec 11 02:17:35 2017 +0000

description:
fix pullup'ed mbuf leaks. pointed out by maxv@n.o, thanks.

XXX need pullup-8

diffstat:

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

diffs (70 lines):

diff -r 6a6b4b7f2c17 -r 6a2470cd64b2 sys/netinet/in_l2tp.c
--- a/sys/netinet/in_l2tp.c     Sun Dec 10 22:04:41 2017 +0000
+++ b/sys/netinet/in_l2tp.c     Mon Dec 11 02:17:35 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_l2tp.c,v 1.4 2017/11/15 10:42:41 knakahara Exp $    */
+/*     $NetBSD: in_l2tp.c,v 1.5 2017/12/11 02:17:35 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.4 2017/11/15 10:42:41 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.5 2017/12/11 02:17:35 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -368,13 +368,9 @@
 
        KASSERT(proto == IPPROTO_L2TP);
 
-       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;
-               }
-        }
+       /* if payload length < 4 octets */
+       if (m->m_len < off + sizeof(uint32_t))
+               return 0;
 
        /* get L2TP session ID */
        m_copydata(m, off, sizeof(uint32_t), (void *)&sess_id);
diff -r 6a6b4b7f2c17 -r 6a2470cd64b2 sys/netinet6/in6_l2tp.c
--- a/sys/netinet6/in6_l2tp.c   Sun Dec 10 22:04:41 2017 +0000
+++ b/sys/netinet6/in6_l2tp.c   Mon Dec 11 02:17:35 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_l2tp.c,v 1.7 2017/11/15 10:42:41 knakahara Exp $   */
+/*     $NetBSD: in6_l2tp.c,v 1.8 2017/12/11 02:17:35 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.7 2017/11/15 10:42:41 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.8 2017/12/11 02:17:35 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -360,13 +360,9 @@
 
        KASSERT(proto == IPPROTO_L2TP);
 
-       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;
-               }
-        }
+       /* if payload length < 4 octets */
+       if (m->m_len < off + sizeof(uint32_t))
+               return 0;
 
        /* get L2TP session ID */
        m_copydata(m, off, sizeof(uint32_t), (void *)&sess_id);