Module Name: src
Committed By: knakahara
Date: Fri Dec 15 05:01:17 UTC 2017
Modified Files:
src/sys/netinet: in_l2tp.c
src/sys/netinet6: in6_l2tp.c
Log Message:
Fix pullup'ed mbuf leaks. The match function just requires enough mbuf length.
XXX need pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/in_l2tp.c
cvs rdiff -u -r1.9 -r1.10 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.6 src/sys/netinet/in_l2tp.c:1.7
--- src/sys/netinet/in_l2tp.c:1.6 Fri Dec 15 04:58:31 2017
+++ src/sys/netinet/in_l2tp.c Fri Dec 15 05:01:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in_l2tp.c,v 1.6 2017/12/15 04:58:31 knakahara Exp $ */
+/* $NetBSD: in_l2tp.c,v 1.7 2017/12/15 05:01:16 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.6 2017/12/15 04:58:31 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.7 2017/12/15 05:01:16 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_l2tp.h"
@@ -369,12 +369,10 @@ in_l2tp_match(struct mbuf *m, int off, i
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 */
+ /* if payload length < 4 octets */
+ if(!m_ensure_contig(&m, off + sizeof(uint32_t)))
return 0;
- }
- }
+ }
/* get L2TP session ID */
m_copydata(m, off, sizeof(uint32_t), (void *)&sess_id);
Index: src/sys/netinet6/in6_l2tp.c
diff -u src/sys/netinet6/in6_l2tp.c:1.9 src/sys/netinet6/in6_l2tp.c:1.10
--- src/sys/netinet6/in6_l2tp.c:1.9 Fri Dec 15 04:58:31 2017
+++ src/sys/netinet6/in6_l2tp.c Fri Dec 15 05:01:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_l2tp.c,v 1.9 2017/12/15 04:58:31 knakahara Exp $ */
+/* $NetBSD: in6_l2tp.c,v 1.10 2017/12/15 05:01:16 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.9 2017/12/15 04:58:31 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.10 2017/12/15 05:01:16 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_l2tp.h"
@@ -361,12 +361,10 @@ in6_l2tp_match(struct mbuf *m, int off,
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 */
+ /* if payload length < 4 octets */
+ if(!m_ensure_contig(&m, off + sizeof(uint32_t)))
return 0;
- }
- }
+ }
/* get L2TP session ID */
m_copydata(m, off, sizeof(uint32_t), (void *)&sess_id);
