diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2016-10-11 22:09:08 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-10-11 22:09:08 +0200 |
| commit | f0c110ecc4b8b04e1bbf6766284d3bf52cd73a30 (patch) | |
| tree | c316da5f31598e8dffff938979e1950fc30ed42b /kernel/net/sched/em_ipset.c | |
| parent | 15d7b6d7a3615c897438955257a7a4f0390ff1d8 (diff) | |
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 <jhs@mojatatu.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/net/sched/em_ipset.c')
| -rw-r--r-- | kernel/net/sched/em_ipset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c index bc1a2f1..87b8419 100644 --- a/kernel/net/sched/em_ipset.c +++ b/kernel/net/sched/em_ipset.c @@ -77,7 +77,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, struct net_device *dev, *indev = NULL; int ret, network_offset; - switch (skb->protocol) { + switch (tc_skb_protocol(skb)) { case htons(ETH_P_IP): acpar.family = NFPROTO_IPV4; if (!pskb_network_may_pull(skb, sizeof(struct iphdr))) |