upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- In vlan_input(), always mask off all but the VLID bits from tags

Browse source 
extracted from received frames, both in the IFCAP_VLAN_HWTAGGING case
  and not. (Some drivers may already do this masking internally, but
  doing it here doesn't hurt and insures consistency.)

- In vlan_ioctl(), don't let the user set a VLAN ID value with anything
  besides the VLID bits set, otherwise we will have trouble matching
  an interface in vlan_input() later.

PR:		kern/46405
This commit is contained in:
Bill Paul 2003-07-08 21:54:20 +00:00
parent d32622aaee
commit fb88a3e0f4
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/net/if_vlan.c
View file

@ -394,7 +394,7 @@ vlan_input(struct ifnet *ifp, struct mbuf *m)
* Packet is tagged, m contains a normal
* Ethernet frame; the tag is stored out-of-band.
*/
tag = *(u_int*)(mtag+1);
tag = EVL_VLANOFTAG(*(u_int*)(mtag+1));
m_tag_delete(m, mtag);
} else {
switch (ifp->if_type) {
@ -409,7 +409,7 @@ vlan_input(struct ifnet *ifp, struct mbuf *m)
("vlan_input: bad encapsulated protocols (%u)",
ntohs(evl->evl_encap_proto)));
tag = ntohs(evl->evl_tag);
tag = EVL_VLANOFTAG(ntohs(evl->evl_tag));
/*
* Restore the original ethertype. We'll remove
@ -737,6 +737,14 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
error = ENOENT;
break;
}
/*
* Don't let the caller set up a VLAN tag with
* anything except VLID bits.
*/
if (vlr.vlr_tag & ~EVL_VLID_MASK) {
error = EINVAL;
break;
}
error = vlan_config(ifv, p);
if (error)
break;

3
sys/net/if_vlan_var.h
View file

@ -40,7 +40,8 @@ struct ether_vlan_header {
u_int16_t evl_proto;
};
#define EVL_VLANOFTAG(tag) ((tag) & 4095)
#define EVL_VLID_MASK 0x0FFF
#define EVL_VLANOFTAG(tag) ((tag) & EVL_VLID_MASK)
#define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7)
/* sysctl(3) tags, for compatibility purposes */