CVS commit: src/sys

[Kengo NAKAHARA]

Module Name:    src
Committed By:   knakahara
Date:           Tue Jul 11 05:03:45 UTC 2017

Modified Files:
        src/sys/netinet: in_l2tp.c
        src/sys/netinet6: in6_l2tp.c

Log Message:
l2tp(4): fix mbuf leak when tunnel nested over the limit

XXX need pullup -8 branch


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/in_l2tp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet6/in6_l2tp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/in_l2tp.c
diff -u src/sys/netinet/in_l2tp.c:1.2 src/sys/netinet/in_l2tp.c:1.3
--- src/sys/netinet/in_l2tp.c:1.2	Thu Mar 30 23:13:54 2017
+++ src/sys/netinet/in_l2tp.c	Tue Jul 11 05:03:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_l2tp.c,v 1.2 2017/03/30 23:13:54 knakahara Exp $	*/
+/*	$NetBSD: in_l2tp.c,v 1.3 2017/07/11 05:03:45 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.2 2017/03/30 23:13:54 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.3 2017/07/11 05:03:45 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -108,8 +108,10 @@ in_l2tp_output(struct l2tp_variant *var,
 
 	ifp = &sc->l2tp_ec.ec_if;
 	error = l2tp_check_nesting(ifp, m);
-	if (error)
+	if (error) {
+		m_freem(m);
 		goto looped;
+	}
 
 #ifdef NETYET
 /* TODO: support ALTQ for innner frame */

Index: src/sys/netinet6/in6_l2tp.c
diff -u src/sys/netinet6/in6_l2tp.c:1.5 src/sys/netinet6/in6_l2tp.c:1.6
--- src/sys/netinet6/in6_l2tp.c:1.5	Tue Apr  4 23:49:18 2017
+++ src/sys/netinet6/in6_l2tp.c	Tue Jul 11 05:03:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_l2tp.c,v 1.5 2017/04/04 23:49:18 knakahara Exp $	*/
+/*	$NetBSD: in6_l2tp.c,v 1.6 2017/07/11 05:03:45 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.5 2017/04/04 23:49:18 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.6 2017/07/11 05:03:45 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -108,8 +108,10 @@ in6_l2tp_output(struct l2tp_variant *var
 	sc = var->lv_softc;
 	ifp = &sc->l2tp_ec.ec_if;
 	error = l2tp_check_nesting(ifp, m);
-	if (error)
+	if (error) {
+		m_freem(m);
 		goto looped;
+	}
 
 #ifdef NOTYET
 /* TODO: support ALTQ for innner frame */