CVS commit: src/sys/net/lagg

[Shoichi YAMAGUCHI]

Module Name:    src
Committed By:   yamaguchi
Date:           Tue Oct  5 04:17:58 UTC 2021

Modified Files:
        src/sys/net/lagg: if_lagg.c

Log Message:
Drop unicast packets that are not for us
when lagg(4) is not in promisc


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/net/lagg/if_lagg.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/lagg/if_lagg.c
diff -u src/sys/net/lagg/if_lagg.c:1.10 src/sys/net/lagg/if_lagg.c:1.11
--- src/sys/net/lagg/if_lagg.c:1.10	Thu Sep 30 04:29:17 2021
+++ src/sys/net/lagg/if_lagg.c	Tue Oct  5 04:17:58 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_lagg.c,v 1.10 2021/09/30 04:29:17 yamaguchi Exp $	*/
+/*	$NetBSD: if_lagg.c,v 1.11 2021/10/05 04:17:58 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <r...@openbsd.org>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.10 2021/09/30 04:29:17 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.11 2021/10/05 04:17:58 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1104,6 +1104,27 @@ lagg_input_ethernet(struct ifnet *ifp_po
 	lagg_port_getref(lp, &psref);
 	pserialize_read_exit(s);
 
+	ifp = &lp->lp_softc->sc_if;
+
+	/*
+	 * Drop promiscuously received packets
+	 * if we are not in promiscuous mode.
+	 */
+	if ((m->m_flags & (M_BCAST | M_MCAST)) == 0 &&
+	    (ifp_port->if_flags & IFF_PROMISC) != 0 &&
+	    (ifp->if_flags & IFF_PROMISC) == 0) {
+		struct ether_header *eh;
+
+		eh = mtod(m, struct ether_header *);
+		if (memcmp(CLLADDR(ifp->if_sadl),
+		    eh->ether_dhost, ETHER_ADDR_LEN) != 0) {
+			m_freem(m);
+			m = NULL;
+			if_statinc(ifp, if_ierrors);
+			goto out;
+		}
+	}
+
 	if (pfil_run_hooks(ifp_port->if_pfil, &m,
 	    ifp_port, PFIL_IN) != 0) {
 		goto out;
@@ -1111,7 +1132,6 @@ lagg_input_ethernet(struct ifnet *ifp_po
 
 	m = lagg_proto_input(lp->lp_softc, lp, m);
 	if (m != NULL) {
-		ifp = &lp->lp_softc->sc_if;
 		m_set_rcvif(m, ifp);
 		if_input(ifp, m);
 		m = NULL;