Module Name: src
Committed By: yamaguchi
Date: Tue Jul 6 02:39:46 UTC 2021
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Drop unicast packets that are not for us
when vlan(4) is not in promisc
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/net/if_vlan.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_vlan.c
diff -u src/sys/net/if_vlan.c:1.156 src/sys/net/if_vlan.c:1.157
--- src/sys/net/if_vlan.c:1.156 Tue Jul 6 02:34:12 2021
+++ src/sys/net/if_vlan.c Tue Jul 6 02:39:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.156 2021/07/06 02:34:12 yamaguchi Exp $ */
+/* $NetBSD: if_vlan.c,v 1.157 2021/07/06 02:39:46 yamaguchi Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.156 2021/07/06 02:34:12 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.157 2021/07/06 02:39:46 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1661,6 +1661,24 @@ vlan_input(struct ifnet *ifp, struct mbu
m_adj(m, mib->ifvm_encaplen);
}
+ /*
+ * Drop promiscuously received packets if we are not in
+ * promiscuous mode
+ */
+ if ((m->m_flags & (M_BCAST | M_MCAST)) == 0 &&
+ (ifp->if_flags & IFF_PROMISC) &&
+ (ifv->ifv_if.if_flags & IFF_PROMISC) == 0) {
+ struct ether_header *eh;
+
+ eh = mtod(m, struct ether_header *);
+ if (memcmp(CLLADDR(ifv->ifv_if.if_sadl),
+ eh->ether_dhost, ETHER_ADDR_LEN) != 0) {
+ m_freem(m);
+ if_statinc(&ifv->ifv_if, if_ierrors);
+ goto out;
+ }
+ }
+
m_set_rcvif(m, &ifv->ifv_if);
if (pfil_run_hooks(ifp->if_pfil, &m, ifp, PFIL_IN) != 0)
