lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 17 Feb 2014 18:30:51 +0100 From: Arend van Spriel <arend@...adcom.com> To: Simon Wunderlich <sw@...onwunderlich.de> CC: <netdev@...r.kernel.org>, <davem@...emloft.net>, <linux-wireless@...r.kernel.org>, <mathias.kretschmer@...us.fraunhofer.de> Subject: Re: [net-next v2 3/3] cfg80211: add MPLS and 802.21 classification On 02/17/14 17:56, Simon Wunderlich wrote: > MPLS labels may contain traffic control information, which should be > evaluated and used by the wireless subsystem if present. > > Also check for IEEE 802.21 which is always network control traffic. > > Signed-off-by: Simon Wunderlich<sw@...onwunderlich.de> > Signed-off-by: Mathias Kretschmer<mathias.kretschmer@...us.fraunhofer.de> > --- > Changes to first version: > > * include linux/mpls.h, not the UAPI one > * change __constant_htons to htons > --- > net/wireless/util.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/net/wireless/util.c b/net/wireless/util.c > index d39c371..54956eb 100644 > --- a/net/wireless/util.c > +++ b/net/wireless/util.c > @@ -11,6 +11,7 @@ > #include<net/ip.h> > #include<net/dsfield.h> > #include<linux/if_vlan.h> > +#include<linux/mpls.h> > #include "core.h" > #include "rdev-ops.h" > > @@ -710,6 +711,29 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb, So does the name still covers what it is doing now or should we just callit cfg80211_classify_skb()? > return vlan_priority; > } > > + if (skb_headlen(skb)>= sizeof(struct ethhdr)) { > + struct ethhdr *eh = (struct ethhdr *)skb->data; > + struct mpls_label_stack mpls_tmp, *mpls; > + > + switch (eh->h_proto) { It seem eh->h_proto should be the same as skb->protocol, right? So why not add these case statements to the switch below? Regards, Arend > + case htons(ETH_P_MPLS_UC): > + case htons(ETH_P_MPLS_MC): > + /* MPLS */ > + mpls = skb_header_pointer(skb, sizeof(*eh), > + sizeof(*mpls),&mpls_tmp); > + if (!mpls) > + break; > + > + return (ntohl(mpls->entry)& MPLS_LS_TC_MASK) > + >> MPLS_LS_TC_SHIFT; > + case htons(ETH_P_80221): > + /* 802.21 is always network control traffic */ > + return 7; > + default: > + break; > + } > + } > + > switch (skb->protocol) { > case htons(ETH_P_IP): > dscp = ipv4_get_dsfield(ip_hdr(skb))& 0xfc; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists