Vlad Buslov 2105f700b5 net/sched: flower: fix parsing of ethertype following VLAN header ... A tc flower filter matching TCA_FLOWER_KEY_VLAN_ETH_TYPE is expected to match the L2 ethertype following the first VLAN header, as confirmed by linked discussion with the maintainer. However, such rule also matches packets that have additional second VLAN header, even though filter has both eth_type and vlan_ethtype set to "ipv4". Looking at the code this seems to be mostly an artifact of the way flower uses flow dissector. First, even though looking at the uAPI eth_type and vlan_ethtype appear like a distinct fields, in flower they are all mapped to the same key->basic.n_proto. Second, flow dissector skips following VLAN header as no keys for FLOW_DISSECTOR_KEY_CVLAN are set and eventually assigns the value of n_proto to last parsed header. With these, such filters ignore any headers present between first VLAN header and first "non magic" header (ipv4 in this case) that doesn't result FLOW_DISSECT_RET_PROTO_AGAIN. Fix the issue by extending flow dissector VLAN key structure with new 'vlan_eth_type' field that matches first ethertype following previously parsed VLAN header. Modify flower classifier to set the new flow_dissector_key_vlan->vlan_eth_type with value obtained from TCA_FLOWER_KEY_VLAN_ETH_TYPE/TCA_FLOWER_KEY_CVLAN_ETH_TYPE uAPIs. Link: https://lore.kernel.org/all/Yjhgi48BpTGh6dig@nanopsycho/ Fixes: 9399ae9a6c ("net_sched: flower: Add vlan support") Fixes: d64efd0926 ("net/sched: flower: Add supprt for matching on QinQ vlan headers") Signed-off-by: Vlad Buslov <vladbu@nvidia.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2022-04-08 12:07:37 +01:00
..
act_api.c	flow_offload: improve extack msg for user when adding invalid filter	2022-03-02 22:16:10 -08:00
act_bpf.c	bpf: Keep the (rcv) timestamp behavior for the existing tc-bpf@ingress	2022-03-03 14:38:48 +00:00
act_connmark.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_csum.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_ct.c	net/sched: act_ct: fix ref leak when switching zones	2022-03-26 17:00:51 -07:00
act_ctinfo.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_gact.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_gate.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_ife.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_ipt.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_meta_mark.c
act_meta_skbprio.c
act_meta_skbtcindex.c
act_mirred.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_mpls.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_nat.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_pedit.c	flow_offload: add ops to tc_action_ops for flow action setup	2021-12-19 14:08:48 +00:00
act_police.c	net: flow_offload: add tc police action parameters	2022-02-28 11:11:35 +00:00
act_sample.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_simple.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_skbedit.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_skbmod.c	flow_offload: fill flags to action structure	2021-12-19 14:08:47 +00:00
act_tunnel_key.c	flow_offload: allow user to offload tc action to net device	2021-12-19 14:08:48 +00:00
act_vlan.c	net/sched: add vlan push_eth and pop_eth action to the hardware IR	2022-03-16 19:59:36 -07:00
cls_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-17 11:44:20 -08:00
cls_basic.c	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_bpf.c	bpf: Keep the (rcv) timestamp behavior for the existing tc-bpf@ingress	2022-03-03 14:38:48 +00:00
cls_cgroup.c	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_flow.c	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_flower.c	net/sched: flower: fix parsing of ethertype following VLAN header	2022-04-08 12:07:37 +01:00
cls_fw.c	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_matchall.c	flow_offload: validate flags of filter and actions	2021-12-19 14:08:48 +00:00
cls_route.c	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_rsvp.c
cls_rsvp.h	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_rsvp6.c
cls_tcindex.c	net_sched: refactor TC action init API	2021-08-02 10:24:38 +01:00
cls_u32.c	flow_offload: validate flags of filter and actions	2021-12-19 14:08:48 +00:00
em_canid.c
em_cmp.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
em_ipset.c
em_ipt.c
em_meta.c	net: introduce sk_forward_alloc_get()	2021-10-27 18:20:29 -07:00
em_nbyte.c	net: sched: Return the correct errno code	2021-02-06 11:15:28 -08:00
em_text.c
em_u32.c
ematch.c	net: sched: Fix spelling mistakes	2021-05-31 22:44:56 -07:00
Kconfig	net: sched: incorrect Kconfig dependencies on Netfilter modules	2020-12-09 15:49:29 -08:00
Makefile	net/sched: sch_frag: add generic packet fragment support.	2020-11-27 14:36:02 -08:00
sch_api.c	net_sched: add __rcu annotation to netdev->qdisc	2022-02-14 13:36:36 +00:00
sch_atm.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_blackhole.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_cake.c	sch_cake: revise Diffserv docs	2022-01-07 08:41:29 -08:00
sch_cbq.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_cbs.c	net: don't include ethtool.h from netdevice.h	2020-11-23 17:27:04 -08:00
sch_choke.c	net: sched: validate stab values	2021-03-10 15:47:52 -08:00
sch_codel.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_drr.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_dsmark.c	net/sched: store the last executed chain also for clsact egress	2021-07-29 22:17:37 +01:00
sch_etf.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_ets.c	net/sched: sch_ets: don't remove idle classes from the round-robin list	2021-12-13 12:30:23 +00:00
sch_fifo.c	net_sched: fix NULL deref in fifo_set_limit()	2021-10-01 14:59:10 -07:00
sch_fq.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_fq_codel.c	fq_codel: generalise ce_threshold marking for subset of traffic	2021-10-20 15:24:36 -07:00
sch_fq_pie.c	net/sched: fq_pie: prevent dismantle issue	2021-12-09 08:01:00 -08:00
sch_frag.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2021-12-31 14:35:40 +00:00
sch_generic.c	net_sched: add __rcu annotation to netdev->qdisc	2022-02-14 13:36:36 +00:00
sch_gred.c	net: sched: gred: dynamically allocate tc_gred_qopt_offload	2021-10-27 12:06:52 -07:00
sch_hfsc.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_hhf.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_htb.c	sch_htb: Fail on unsupported parameters when offload is requested	2022-01-25 20:00:02 -08:00
sch_ingress.c
sch_mq.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_mqprio.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_multiq.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_netem.c	net: sched: sch_netem: Refactor code in 4-state loss generator	2021-11-15 13:23:23 +00:00
sch_pie.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
sch_plug.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_prio.c	net: sched: Remove Qdisc::running sequence counter	2021-10-18 12:54:41 +01:00
sch_qfq.c	sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc	2022-01-04 12:36:51 +00:00
sch_red.c	net: sched: validate stab values	2021-03-10 15:47:52 -08:00
sch_sfb.c	net/sched: store the last executed chain also for clsact egress	2021-07-29 22:17:37 +01:00
sch_sfq.c	net/sched: store the last executed chain also for clsact egress	2021-07-29 22:17:37 +01:00
sch_skbprio.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_taprio.c	net/sched: sch_taprio: fix undefined behavior in ktime_mono_to_any	2021-11-09 19:16:23 -08:00
sch_tbf.c	net: sch_tbf: Add a graft command	2021-10-19 12:24:51 +01:00
sch_teql.c	net: sched: sch_teql: fix null-pointer dereference	2021-04-08 14:14:42 -07:00