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

When we receive an incoming Ethernet frame that was unicast to a

Browse Source 
different hardware address, we should drop it (this should only
happen in promiscuous mode). Relocate the code for this check
from before ng_ether(4) processing to after ng_ether(4) processing.
Also fix a compiler warning.

PR:		kern/24465
This commit is contained in:
Archie Cobbs 2001-02-08 17:56:49 +00:00
parent 5fe43ff5b5
commit cb24f323d0
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/net/if_ethersubr.c
View File

@ -412,7 +412,9 @@ ether_input(ifp, eh, m)
struct ether_header *eh;
struct mbuf *m;
{
#ifdef BRIDGE
struct ether_header save_eh;
#endif
/* Check for a BPF tap */
if (ifp->if_bpf != NULL) {
@ -472,16 +474,6 @@ ether_input(ifp, eh, m)
}
#endif
/* Discard packet if upper layers shouldn't see it. This should
only happen when the interface is in promiscuous mode. */
if ((ifp->if_flags & IFF_PROMISC) != 0
&& (eh->ether_dhost[0] & 1) == 0
&& bcmp(eh->ether_dhost,
IFP2AC(ifp)->ac_enaddr, ETHER_ADDR_LEN) != 0) {
m_freem(m);
return;
}
#ifdef BRIDGE
recvLocal:
#endif
@ -504,6 +496,18 @@ ether_demux(ifp, eh, m)
register struct llc *l;
#endif
/* Discard packet if upper layers shouldn't see it because it was
unicast to a different Ethernet address. If the driver is working
properly, then this situation can only happen when the interface
is in promiscuous mode. */
if ((ifp->if_flags & IFF_PROMISC) != 0
&& (eh->ether_dhost[0] & 1) == 0
&& bcmp(eh->ether_dhost,
IFP2AC(ifp)->ac_enaddr, ETHER_ADDR_LEN) != 0) {
m_freem(m);
return;
}
/* Discard packet if interface is not up */
if ((ifp->if_flags & IFF_UP) == 0) {
m_freem(m);