Index: if_aggr.c
===================================================================
RCS file: /cvs/src/sys/net/if_aggr.c,v
retrieving revision 1.24
diff -u -p -r1.24 if_aggr.c
--- if_aggr.c	11 Nov 2019 03:37:41 -0000	1.24
+++ if_aggr.c	11 Dec 2019 10:29:46 -0000
@@ -307,7 +307,7 @@ struct aggr_multiaddr {
 	unsigned int		m_refs;
 	uint8_t			m_addrlo[ETHER_ADDR_LEN];
 	uint8_t			m_addrhi[ETHER_ADDR_LEN];
-	struct sockaddr		m_addr;
+	struct sockaddr_storage m_addr;
 };
 TAILQ_HEAD(aggr_multiaddrs, aggr_multiaddr);
 
@@ -2556,15 +2556,18 @@ aggr_multi(struct aggr_softc *sc, struct
     const struct aggr_multiaddr *ma, u_long cmd)
 {
 	struct ifnet *ifp0 = p->p_ifp0;
-	struct ifreq ifr;
+	struct {
+		char			if_name[IFNAMSIZ];
+		struct sockaddr_storage if_addr;
+	} ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
 
 	/* make it convincing */
-	CTASSERT(sizeof(ifr.ifr_name) == sizeof(ifp0->if_xname));
-	memcpy(ifr.ifr_name, ifp0->if_xname, sizeof(ifr.ifr_name));
+	CTASSERT(sizeof(ifr.if_name) == sizeof(ifp0->if_xname));
+	memcpy(ifr.if_name, ifp0->if_xname, sizeof(ifr.if_name));
 
-	ifr.ifr_addr = ma->m_addr;
+	ifr.if_addr = ma->m_addr;
 
 	return ((*p->p_ioctl)(ifp0, cmd, (caddr_t)&ifr));
 }
@@ -2826,12 +2829,12 @@ aggr_multi_add(struct aggr_softc *sc, st
 		}
 	}
 
-	ma = malloc(sizeof(*ma), M_DEVBUF, M_WAITOK|M_CANFAIL);
+	ma = malloc(sizeof(*ma), M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO);
 	if (ma == NULL)
 		return (ENOMEM);
 
 	ma->m_refs = 1;
-	ma->m_addr = ifr->ifr_addr;
+	memcpy(&ma->m_addr, &ifr->ifr_addr, ifr->ifr_addr.sa_len);
 	memcpy(ma->m_addrlo, addrlo, sizeof(ma->m_addrlo));
 	memcpy(ma->m_addrhi, addrhi, sizeof(ma->m_addrhi));
 	TAILQ_INSERT_TAIL(&sc->sc_multiaddrs, ma, m_entry);