From 3d877566ccf3785fee7d0aefa9abb0ab070a9bde Mon Sep 17 00:00:00 2001
From: dlg <dlg@openbsd.org>
Date: Sun, 7 Mar 2021 06:02:32 +0000
Subject: [PATCH] use uint64_t ethernet addresses for compares in carp.

pass the uint64_t that ether_input has already converted from a
real ethernet address into carp_input so it can use it without
having to do its own conversion.

tested by hrvoje popovski
tested by me on amd64 and sparc64
ok patrick@ jmatthew@
---
 sys/net/if_ethersubr.c |  4 ++--
 sys/netinet/ip_carp.c  | 25 ++++++++++++-------------
 sys/netinet/ip_carp.h  |  4 ++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 79d8ec94122..c9493b7f857 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.273 2021/03/05 06:44:09 dlg Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.274 2021/03/07 06:02:32 dlg Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -460,7 +460,7 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
 		 */
 		if (ifp->if_type != IFT_CARP &&
 		    !SRPL_EMPTY_LOCKED(&ifp->if_carp)) {
-			m = carp_input(ifp, m);
+			m = carp_input(ifp, m, dst);
 			if (m == NULL)
 				return;
 
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 15593a5fbf0..491f66482c6 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.c,v 1.352 2021/02/08 12:30:10 bluhm Exp $	*/
+/*	$OpenBSD: ip_carp.c,v 1.353 2021/03/07 06:02:32 dlg Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -260,7 +260,7 @@ void	carp_update_lsmask(struct carp_softc *);
 int	carp_new_vhost(struct carp_softc *, int, int);
 void	carp_destroy_vhosts(struct carp_softc *);
 void	carp_del_all_timeouts(struct carp_softc *);
-int	carp_vhe_match(struct carp_softc *, uint8_t *);
+int	carp_vhe_match(struct carp_softc *, uint64_t);
 
 struct if_clone carp_cloner =
     IF_CLONE_INITIALIZER("carp", carp_clone_create, carp_clone_destroy);
@@ -1345,6 +1345,7 @@ carp_ourether(struct ifnet *ifp, uint8_t *ena)
 	struct carp_softc *sc;
 	struct srp_ref sr;
 	int match = 0;
+	uint64_t dst = ether_addr_to_e64((struct ether_addr *)ena);
 
 	KASSERT(ifp->if_type == IFT_ETHER);
 
@@ -1352,7 +1353,7 @@ carp_ourether(struct ifnet *ifp, uint8_t *ena)
 		if ((sc->sc_if.if_flags & (IFF_UP|IFF_RUNNING)) !=
 		    (IFF_UP|IFF_RUNNING))
 			continue;
-		if (carp_vhe_match(sc, ena)) {
+		if (carp_vhe_match(sc, dst)) {
 			match = 1;
 			break;
 		}
@@ -1363,29 +1364,27 @@ carp_ourether(struct ifnet *ifp, uint8_t *ena)
 }
 
 int
-carp_vhe_match(struct carp_softc *sc, uint8_t *ena)
+carp_vhe_match(struct carp_softc *sc, uint64_t dst)
 {
 	struct carp_vhost_entry *vhe;
 	struct srp_ref sr;
-	int match = 0;
+	int active = 0;
 
 	vhe = SRPL_FIRST(&sr, &sc->carp_vhosts);
-	match = (vhe->state == MASTER || sc->sc_balancing >= CARP_BAL_IP) &&
-	    !memcmp(ena, sc->sc_ac.ac_enaddr, ETHER_ADDR_LEN);
+	active = (vhe->state == MASTER || sc->sc_balancing >= CARP_BAL_IP);
 	SRPL_LEAVE(&sr);
 
-	return (match);
+	return (active && (dst ==
+	    ether_addr_to_e64((struct ether_addr *)sc->sc_ac.ac_enaddr)));
 }
 
 struct mbuf *
-carp_input(struct ifnet *ifp0, struct mbuf *m)
+carp_input(struct ifnet *ifp0, struct mbuf *m, uint64_t dst)
 {
-	struct ether_header *eh;
 	struct srpl *cif;
 	struct carp_softc *sc;
 	struct srp_ref sr;
 
-	eh = mtod(m, struct ether_header *);
 	cif = &ifp0->if_carp;
 
 	SRPL_FOREACH(sc, &sr, cif, sc_list) {
@@ -1393,7 +1392,7 @@ carp_input(struct ifnet *ifp0, struct mbuf *m)
 		    (IFF_UP|IFF_RUNNING))
 			continue;
 
-		if (carp_vhe_match(sc, eh->ether_dhost)) {
+		if (carp_vhe_match(sc, dst)) {
 			/*
 			 * These packets look like layer 2 multicast but they
 			 * are unicast at layer 3. With help of the tag the
@@ -1417,7 +1416,7 @@ carp_input(struct ifnet *ifp0, struct mbuf *m)
 	if (sc == NULL) {
 		SRPL_LEAVE(&sr);
 
-		if (!ETHER_IS_MULTICAST(eh->ether_dhost))
+		if (!ETH64_IS_MULTICAST(dst))
 			return (m);
 
 		/*
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index f06f8f5416c..78277ba16a7 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.h,v 1.50 2020/07/24 18:17:15 mvs Exp $	*/
+/*	$OpenBSD: ip_carp.h,v 1.51 2021/03/07 06:02:32 dlg Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -209,7 +209,7 @@ carp_strict_addr_chk(struct ifnet *ifp_a, struct ifnet *ifp_b)
 	    ifp_a->if_carpdevidx == ifp_b->if_carpdevidx));
 }
 
-struct mbuf	*carp_input(struct ifnet *, struct mbuf *);
+struct mbuf	*carp_input(struct ifnet *, struct mbuf *, uint64_t);
 
 int		 carp_proto_input(struct mbuf **, int *, int, int);
 void		 carp_carpdev_state(void *);
-- 
2.20.1