d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Byte copy IF_LLADDR() on stack to align it to be safe for typecasts.

Browse Source 
Tested by:	jhb
This commit is contained in:
ru 2005-11-30 17:48:23 +00:00
parent 49ff09c82e
commit 472f9c4334
4 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/dev/de/if_de.c
View File

@ -3023,6 +3023,7 @@ tulip_addr_filter(tulip_softc_t * const sc)
struct ifmultiaddr *ifma;
struct ifnet *ifp;
u_char *addrp;
u_char eaddr[ETHER_ADDR_LEN];
int multicnt;
TULIP_LOCK_ASSERT(sc);
@ -3038,6 +3039,10 @@ tulip_addr_filter(tulip_softc_t * const sc)
multicnt = 0;
ifp = sc->tulip_ifp;
IF_ADDR_LOCK(ifp);
/* Copy MAC address on stack to align. */
bcopy(IF_LLADDR(ifp), eaddr, ETHER_ADDR_LEN);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family == AF_LINK)
@ -3081,12 +3086,12 @@ tulip_addr_filter(tulip_softc_t * const sc)
hash = tulip_mchash(ifp->if_broadcastaddr);
sp[hash >> 4] |= htole32(1 << (hash & 0xF));
if (sc->tulip_flags & TULIP_WANTHASHONLY) {
hash = tulip_mchash(IF_LLADDR(ifp));
hash = tulip_mchash(eaddr);
sp[hash >> 4] |= htole32(1 << (hash & 0xF));
} else {
sp[39] = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 0);
sp[40] = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 1);
sp[41] = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 2);
sp[39] = TULIP_SP_MAC(((u_int16_t *)eaddr)[0]);
sp[40] = TULIP_SP_MAC(((u_int16_t *)eaddr)[1]);
sp[41] = TULIP_SP_MAC(((u_int16_t *)eaddr)[2]);
}
}
}
@ -3101,32 +3106,26 @@ tulip_addr_filter(tulip_softc_t * const sc)
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
addrp = LLADDR((struct sockaddr_dl *)ifma->ifma_addr);
*sp++ = TULIP_SP_MAC((u_int16_t *)addrp + 0);
*sp++ = TULIP_SP_MAC((u_int16_t *)addrp + 1);
*sp++ = TULIP_SP_MAC((u_int16_t *)addrp + 2);
*sp++ = TULIP_SP_MAC(((u_int16_t *)addrp)[0]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)addrp)[1]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)addrp)[2]);
idx++;
}
/*
* Add the broadcast address.
*/
idx++;
#if BYTE_ORDER == BIG_ENDIAN
*sp++ = 0xFFFF << 16;
*sp++ = 0xFFFF << 16;
*sp++ = 0xFFFF << 16;
#else
*sp++ = 0xFFFF;
*sp++ = 0xFFFF;
*sp++ = 0xFFFF;
#endif
*sp++ = TULIP_SP_MAC(0xFFFF);
*sp++ = TULIP_SP_MAC(0xFFFF);
*sp++ = TULIP_SP_MAC(0xFFFF);
}
/*
* Pad the rest with our hardware address
*/
for (; idx < 16; idx++) {
*sp++ = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 0);
*sp++ = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 1);
*sp++ = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 2);
*sp++ = TULIP_SP_MAC(((u_int16_t *)eaddr)[0]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)eaddr)[1]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)eaddr)[2]);
}
}
IF_ADDR_UNLOCK(ifp);

4
sys/dev/de/if_devar.h
View File

@ -837,9 +837,9 @@ static const struct {
* endian case, just shift them left 16.
*/
#if BYTE_ORDER == BIG_ENDIAN
#define TULIP_SP_MAC(ptr) (be16dec(ptr) << 16)
#define TULIP_SP_MAC(x) ((x) << 16)
#else
#define TULIP_SP_MAC(ptr) (le16dec(ptr))
#define TULIP_SP_MAC(x) (x)
#endif
/*

37
sys/pci/if_de.c
View File

@ -3023,6 +3023,7 @@ tulip_addr_filter(tulip_softc_t * const sc)
struct ifmultiaddr *ifma;
struct ifnet *ifp;
u_char *addrp;
u_char eaddr[ETHER_ADDR_LEN];
int multicnt;
TULIP_LOCK_ASSERT(sc);
@ -3038,6 +3039,10 @@ tulip_addr_filter(tulip_softc_t * const sc)
multicnt = 0;
ifp = sc->tulip_ifp;
IF_ADDR_LOCK(ifp);
/* Copy MAC address on stack to align. */
bcopy(IF_LLADDR(ifp), eaddr, ETHER_ADDR_LEN);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family == AF_LINK)
@ -3081,12 +3086,12 @@ tulip_addr_filter(tulip_softc_t * const sc)
hash = tulip_mchash(ifp->if_broadcastaddr);
sp[hash >> 4] |= htole32(1 << (hash & 0xF));
if (sc->tulip_flags & TULIP_WANTHASHONLY) {
hash = tulip_mchash(IF_LLADDR(ifp));
hash = tulip_mchash(eaddr);
sp[hash >> 4] |= htole32(1 << (hash & 0xF));
} else {
sp[39] = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 0);
sp[40] = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 1);
sp[41] = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 2);
sp[39] = TULIP_SP_MAC(((u_int16_t *)eaddr)[0]);
sp[40] = TULIP_SP_MAC(((u_int16_t *)eaddr)[1]);
sp[41] = TULIP_SP_MAC(((u_int16_t *)eaddr)[2]);
}
}
}
@ -3101,32 +3106,26 @@ tulip_addr_filter(tulip_softc_t * const sc)
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
addrp = LLADDR((struct sockaddr_dl *)ifma->ifma_addr);
*sp++ = TULIP_SP_MAC((u_int16_t *)addrp + 0);
*sp++ = TULIP_SP_MAC((u_int16_t *)addrp + 1);
*sp++ = TULIP_SP_MAC((u_int16_t *)addrp + 2);
*sp++ = TULIP_SP_MAC(((u_int16_t *)addrp)[0]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)addrp)[1]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)addrp)[2]);
idx++;
}
/*
* Add the broadcast address.
*/
idx++;
#if BYTE_ORDER == BIG_ENDIAN
*sp++ = 0xFFFF << 16;
*sp++ = 0xFFFF << 16;
*sp++ = 0xFFFF << 16;
#else
*sp++ = 0xFFFF;
*sp++ = 0xFFFF;
*sp++ = 0xFFFF;
#endif
*sp++ = TULIP_SP_MAC(0xFFFF);
*sp++ = TULIP_SP_MAC(0xFFFF);
*sp++ = TULIP_SP_MAC(0xFFFF);
}
/*
* Pad the rest with our hardware address
*/
for (; idx < 16; idx++) {
*sp++ = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 0);
*sp++ = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 1);
*sp++ = TULIP_SP_MAC((u_int16_t *)IF_LLADDR(ifp) + 2);
*sp++ = TULIP_SP_MAC(((u_int16_t *)eaddr)[0]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)eaddr)[1]);
*sp++ = TULIP_SP_MAC(((u_int16_t *)eaddr)[2]);
}
}
IF_ADDR_UNLOCK(ifp);

4
sys/pci/if_devar.h
View File

@ -837,9 +837,9 @@ static const struct {
* endian case, just shift them left 16.
*/
#if BYTE_ORDER == BIG_ENDIAN
#define TULIP_SP_MAC(ptr) (be16dec(ptr) << 16)
#define TULIP_SP_MAC(x) ((x) << 16)
#else
#define TULIP_SP_MAC(ptr) (le16dec(ptr))
#define TULIP_SP_MAC(x) (x)
#endif
/*