Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug that vlan(4) fragments IPv6 packets 

even the MTU > packet length.

The bug is appeared when the mtu is increased on SIOCSETVLAN.

From t-kusaba@IIJ
This commit is contained in:
yamaguchi 2019-11-11 02:34:46 +00:00
parent ffac73eb32
commit 721fbb307c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/if_vlan.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_vlan.c,v 1.147 2019/10/21 06:26:12 ozaki-r Exp $ */ /* $NetBSD: if_vlan.c,v 1.148 2019/11/11 02:34:46 yamaguchi Exp $ */
/* /*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -78,7 +78,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.147 2019/10/21 06:26:12 ozaki-r Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.148 2019/11/11 02:34:46 yamaguchi Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_inet.h" #include "opt_inet.h"
@ -119,6 +119,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.147 2019/10/21 06:26:12 ozaki-r Exp $"
#ifdef INET6 #ifdef INET6
#include <netinet6/in6_ifattach.h> #include <netinet6/in6_ifattach.h>
#include <netinet6/in6_var.h> #include <netinet6/in6_var.h>
#include <netinet6/nd6.h>
#endif #endif
#include "ioconf.h" #include "ioconf.h"
@ -540,6 +541,12 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t tag)
nmib->ifvm_p = p; nmib->ifvm_p = p;
nmib->ifvm_tag = vid; nmib->ifvm_tag = vid;
ifv->ifv_if.if_mtu = p->if_mtu - nmib->ifvm_mtufudge; ifv->ifv_if.if_mtu = p->if_mtu - nmib->ifvm_mtufudge;
#ifdef INET6
KERNEL_LOCK_UNLESS_NET_MPSAFE();
if (in6_present)
nd6_setmtu(ifp);
KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
#endif
ifv->ifv_if.if_flags = p->if_flags & ifv->ifv_if.if_flags = p->if_flags &
(IFF_UP | IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); (IFF_UP | IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);