From f0c110ecc4b8b04e1bbf6766284d3bf52cd73a30 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Tue, 11 Oct 2016 22:09:08 +0200 Subject: net: sched: fix skb->protocol use in case of accelerated vlan path tc code implicitly considers skb->protocol even in case of accelerated vlan paths and expects vlan protocol type here. However, on rx path, if the vlan header was already stripped, skb->protocol contains value of next header. Similar situation is on tx path. So for skbs that use skb->vlan_tci for tagging, use skb->vlan_proto instead. Reported-by: Jamal Hadi Salim Signed-off-by: Jiri Pirko Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller --- kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'kernel/include/linux/netfilter/ipset') diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index fe24255..062becb 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -33,6 +33,7 @@ #@HAVE_NLA_PUT_IN_ADDR@ HAVE_NLA_PUT_IN_ADDR #@HAVE_NET_IN_NFNL_CALLBACK_FN@ HAVE_NET_IN_NFNL_CALLBACK_FN #@HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H@ HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H +#@HAVE_TC_SKB_PROTOCOL@ HAVE_TC_SKB_PROTOCOL #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include @@ -273,6 +274,16 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, #define IPSET_SOCK_NET(net, ctnl) sock_net(ctnl) #endif +#ifndef HAVE_TC_SKB_PROTOCOL +#include +static inline __be16 tc_skb_protocol(const struct sk_buff *skb) +{ + if (vlan_tx_tag_present(skb)) + return skb->vlan_proto; + return skb->protocol; +} +#endif + #ifndef smp_mb__before_atomic #define smp_mb__before_atomic() smp_mb() #define smp_mb__after_atomic() smp_mb() -- cgit v1.2.3