diff options
author | Jamal Hadi Salim <jhs@mojatatu.com> | 2016-02-18 13:38:04 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-18 17:14:19 +0100 |
commit | 619fe32640b4b01f370574d50344ae0f62689816 (patch) | |
tree | 7d0d02fb0e21601e637a698224d080269949e300 | |
parent | Merge branch 'mlxsw-fixes' (diff) | |
download | linux-619fe32640b4b01f370574d50344ae0f62689816.tar.xz linux-619fe32640b4b01f370574d50344ae0f62689816.zip |
net_sched fix: reclassification needs to consider ether protocol changes
actions could change the etherproto in particular with ethernet
tunnelled data. Typically such actions, after peeling the outer header,
will ask for the packet to be reclassified. We then need to restart
the classification with the new proto header.
Example setup used to catch this:
sudo tc qdisc add dev $ETH ingress
sudo $TC filter add dev $ETH parent ffff: pref 1 protocol 802.1Q \
u32 match u32 0 0 flowid 1:1 \
action vlan pop reclassify
Fixes: 3b3ae880266d ("net: sched: consolidate tc_classify{,_compat}")
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/sch_api.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index b5c2cf2aa6d4..af1acf009866 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1852,6 +1852,7 @@ reset: } tp = old_tp; + protocol = tc_skb_protocol(skb); goto reclassify; #endif } |