 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ethersubr.c,v 1.322 2022/11/15 09:14:28 roy Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.323 2022/11/15 10:47:39 roy Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)if_ethersubr.c	8.2 (Berkeley) 4/4/96
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.322 2022/11/15 09:14:28 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.323 2022/11/15 10:47:39 roy Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_gateway.h"
 #include "opt_pppoe.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "vlan.h"
 #include "pppoe.h"
 @@ -876,26 +876,39 @@ ether_input(struct ifnet *ifp, struct mb
 	/* etype represents the size of the payload in this case */
 	if (etype <= ETHERMTU + sizeof(struct ether_header)) {
 		KASSERT(ehlen == sizeof(*eh));
 #if defined (LLC) || defined (NETATALK)
 		ether_input_llc(ifp, m, eh);
 		return;
 #else
 		/* ethertype of 0-1500 is regarded as noproto */
 		goto noproto;
 #endif
+	}
 	/* For ARP packets, store the source address so that
 	 * ARP DAD probes can be validated. */
 	if (etype == ETHERTYPE_ARP) {
 		struct m_tag *mtag;
 		mtag = m_tag_get(PACKET_TAG_ETHERNET_SRC, ETHER_ADDR_LEN,
 		    M_NOWAIT);
 		if (mtag != NULL) {
 			memcpy(mtag + 1, &eh->ether_shost, ETHER_ADDR_LEN);
 			m_tag_prepend(m, mtag);
+		}
+	}
 	/* Strip off the Ethernet header. */
 	m_adj(m, ehlen);
 	switch (etype) {
 #ifdef INET
 	case ETHERTYPE_IP:
 #ifdef GATEWAY
 		if (ipflow_fastforward(m))
 			return;
 #endif
 		pktq = ip_pktq;
 		rps_hash = atomic_load_relaxed(&ether_pktq_rps_hash_p);
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_arp.c,v 1.310 2022/11/15 09:15:43 roy Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.311 2022/11/15 10:47:39 roy Exp $	*/
 /*
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Public Access Networks Corporation ("Panix").  It was developed under
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -58,27 +58,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)if_ether.c	8.2 (Berkeley) 9/26/94
  */
 /*
  * Ethernet address resolution protocol.
  * TODO:
  *	add "inuse/lock" bit (or ref. count) along with valid bit
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.310 2022/11/15 09:15:43 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.311 2022/11/15 10:47:39 roy Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #ifdef INET
 #include "arp.h"
 #include "bridge.h"
 #include <sys/param.h>
 @@ -922,46 +922,54 @@ again:
 	/*
 	 * If the source IP address is zero, this is an RFC 5227 ARP probe
 	 */
 	if (in_nullhost(isaddr))
 		ARP_STATINC(ARP_STAT_RCVZEROSPA);
 	else if (in_hosteq(isaddr, myaddr))
 		ARP_STATINC(ARP_STAT_RCVLOCALSPA);
 	if (in_nullhost(itaddr))
 		ARP_STATINC(ARP_STAT_RCVZEROTPA);
 	/*
 	 * DAD check, RFC 5227.
 	 * ARP sender hardware address must match the interface
 	 * address of the interface sending the packet.
 	 * Collision on sender address is always a duplicate.
 	 * Collision on target address is only a duplicate
 	 * IF the sender address is the null host (ie a DAD probe)
 	 * AND the message was broadcast
 	 * AND our address is either tentative or duplicated
 	 * If it was unicast then it's a valid Unicast Poll from RFC 1122.
 	 */
 	if (do_dad &&
 	    (in_hosteq(isaddr, myaddr) ||
 	    (in_nullhost(isaddr) && in_hosteq(itaddr, myaddr) &&
 	     m->m_flags & M_BCAST &&
 	     ia->ia4_flags & (IN_IFF_TENTATIVE | IN_IFF_DUPLICATED))))
+	{
-		struct sockaddr_dl sdl, *sdlp;
+		struct m_tag *mtag;
-		sdlp = sockaddr_dl_init(&sdl, sizeof(sdl),
+		mtag = m_tag_find(m, PACKET_TAG_ETHERNET_SRC);
-		    ifp->if_index, ifp->if_type,
+		if (mtag == NULL || (ah->ar_hln == ETHER_ADDR_LEN &&
-		    NULL, 0, ar_sha(ah), ah->ar_hln);
+		    memcmp(mtag + 1, ar_sha(ah), ah->ar_hln) == 0)) {
-		arp_dad_duplicated((struct ifaddr *)ia, sdlp);
+			struct sockaddr_dl sdl, *sdlp;
 		goto out;
 			sdlp = sockaddr_dl_init(&sdl, sizeof(sdl),
 			    ifp->if_index, ifp->if_type,
 			    NULL, 0, ar_sha(ah), ah->ar_hln);
 			arp_dad_duplicated((struct ifaddr *)ia, sdlp);
 			goto out;
+		}
+	}
 	/*
 	 * If the target IP address is zero, ignore the packet.
 	 * This prevents the code below from trying to answer
 	 * when we are using IP address zero (booting).
 	 */
 	if (in_nullhost(itaddr))
 		goto out;
 	if (in_nullhost(isaddr))
 		goto reply;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbuf.h,v 1.235 2022/11/15 09:13:43 roy Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.236 2022/11/15 10:47:39 roy Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -790,26 +790,27 @@ int	m_tag_copy_chain(struct mbuf *, stru
 #define PACKET_TAG_SO			4  /* sending socket pointer */
 #define PACKET_TAG_NPF			10 /* packet filter */
 #define PACKET_TAG_PF			11 /* packet filter */
 #define PACKET_TAG_ALTQ_QID		12 /* ALTQ queue id */
 #define PACKET_TAG_IPSEC_OUT_DONE	18
 #define PACKET_TAG_IPSEC_NAT_T_PORTS	25 /* two uint16_t */
 #define PACKET_TAG_INET6		26 /* IPv6 info */
 #define PACKET_TAG_TUNNEL_INFO		28 /* tunnel identification and
 					    * protocol callback, for loop
 					    * detection/recovery
 					    */
 #define PACKET_TAG_MPLS			29 /* Indicate it's for MPLS */
 #define PACKET_TAG_SRCROUTE		30 /* IPv4 source routing */
 #define PACKET_TAG_ETHERNET_SRC		31 /* Ethernet source address */
 /*
  * Return the number of bytes in the mbuf chain, m.
  */
 static __inline u_int
 m_length(const struct mbuf *m)
+{
 	const struct mbuf *m0;
 	u_int pktlen;
 	if ((m->m_flags & M_PKTHDR) != 0)
 		return m->m_pkthdr.len;