Module Name: src
Committed By: yamaguchi
Date: Wed Nov 25 10:38:10 UTC 2020
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
fix to remove trailing garbage
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/net/if_pppoe.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/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.155 src/sys/net/if_pppoe.c:1.156
--- src/sys/net/if_pppoe.c:1.155 Wed Nov 25 10:37:04 2020
+++ src/sys/net/if_pppoe.c Wed Nov 25 10:38:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.155 2020/11/25 10:37:04 yamaguchi Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.156 2020/11/25 10:38:10 yamaguchi Exp $ */
/*
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.155 2020/11/25 10:37:04 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.156 2020/11/25 10:38:10 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -1144,6 +1144,8 @@ pppoe_data_input(struct mbuf *m)
if (m->m_pkthdr.len < plen)
goto drop;
+ /* ignore trailing garbage */
+ m_adj(m, plen - m->m_pkthdr.len);
/*
* Fix incoming interface pointer (not the raw ethernet interface
* anymore)
