Boris Sukholitko 0dca2c7404 net/sched: cls_flower: Remove match on n_proto ... The following flower filters fail to match packets: tc filter add dev eth0 ingress protocol 0x8864 flower \ action simple sdata hi64 tc filter add dev eth0 ingress protocol 802.1q flower \ vlan_ethtype 0x8864 action simple sdata "hi vlan" The protocol 0x8864 (ETH_P_PPP_SES) is a tunnel protocol. As such, it is being dissected by __skb_flow_dissect and it's internal protocol is being set as key->basic.n_proto. IOW, the existence of ETH_P_PPP_SES tunnel is transparent to the callers of __skb_flow_dissect. OTOH, in the filters above, cls_flower configures its key->basic.n_proto to the ETH_P_PPP_SES value configured by the user. Matching on this key fails because of __skb_flow_dissect "transparency" mentioned above. In the following, I would argue that the problem lies with cls_flower, unnessary attempting key->basic.n_proto match. There are 3 close places in fl_set_key in cls_flower setting up mask->basic.n_proto. They are (in reverse order of appearance in the code) due to: (a) No vlan is given: use TCA_FLOWER_KEY_ETH_TYPE parameter (b) One vlan tag is given: use TCA_FLOWER_KEY_VLAN_ETH_TYPE (c) Two vlans are given: use TCA_FLOWER_KEY_CVLAN_ETH_TYPE The match in case (a) is unneeded because flower has no its own eth_type parameter. It was removed by Jamal Hadi Salim in commit 488b41d020fb06428b90289f70a41210718f52b7 in iproute2. For TCA_FLOWER_KEY_ETH_TYPE the userspace uses the generic tc filter protocol field. Therefore the match for the case (a) is done by tc itself. The matches in cases (b), (c) are unneeded because the protocol will appear in and will be matched by flow_dissector_key_vlan.vlan_tpid. Therefore in the best case, key->basic.n_proto will try to repeat vlan key match again. The below patch removes mask->basic.n_proto setting and resets it to 0 in case (c). Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2021-06-15 10:26:51 -07:00
..
act_api.c	net: sched: fix err handler in tcf_action_init()	2021-04-08 13:47:33 -07:00
act_bpf.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
act_connmark.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_csum.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_ct.c	net/sched: act_ct: Fix ct template allocation for zone 0	2021-05-27 14:54:23 -07:00
act_ctinfo.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
act_gact.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_gate.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
act_ife.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_ipt.c	treewide: rename nla_strlcpy to nla_strscpy.	2020-11-16 08:08:54 -08:00
act_meta_mark.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
act_meta_skbprio.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
act_meta_skbtcindex.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
act_mirred.c	net/sched: sch_frag: add generic packet fragment support.	2020-11-27 14:36:02 -08:00
act_mpls.c	net/sched: act_mpls: ensure LSE is pullable before reading it	2020-12-03 11:13:37 -08:00
act_nat.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_pedit.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_police.c	net/sched: act_police: add support for packet-per-second policing	2021-03-13 14:18:09 -08:00
act_sample.c	psample: Encapsulate packet metadata in a struct	2021-03-14 15:00:43 -07:00
act_simple.c	treewide: rename nla_strlcpy to nla_strscpy.	2020-11-16 08:08:54 -08:00
act_skbedit.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_skbmod.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_tunnel_key.c	net/sched: act_tunnel_key: fix OOB write in case of IPv6 ERSPAN tunnels	2020-10-20 21:10:41 -07:00
act_vlan.c	net/sched: act_vlan: No dump for unset priority	2021-06-01 16:54:42 -07:00
cls_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-05-27 09:55:10 -07:00
cls_basic.c	net_sched: fix ops->bind_class() implementations	2020-01-27 10:51:43 +01:00
cls_bpf.c	net_sched: fix ops->bind_class() implementations	2020-01-27 10:51:43 +01:00
cls_cgroup.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
cls_flow.c	Remove uninitialized_var() macro for v5.9-rc1	2020-08-04 13:49:43 -07:00
cls_flower.c	net/sched: cls_flower: Remove match on n_proto	2021-06-15 10:26:51 -07:00
cls_fw.c	net_sched: fix ops->bind_class() implementations	2020-01-27 10:51:43 +01:00
cls_matchall.c	net: qos offload add flow status with dropped count	2020-06-19 12:53:30 -07:00
cls_route.c	net_sched: cls_route: remove the right filter from hashtable	2020-03-16 01:59:32 -07:00
cls_rsvp6.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
cls_rsvp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
cls_rsvp.h	net: sched: Fix spelling mistakes	2021-05-31 22:44:56 -07:00
cls_tcindex.c	net_sched: avoid shift-out-of-bounds in tcindex_set_parms()	2021-01-15 18:11:10 -08:00
cls_u32.c	net/sched: cls_u32: simplify the return expression of u32_reoffload_knode()	2020-12-08 16:22:53 -08:00
em_canid.c	net: sched: kerneldoc fixes	2020-07-13 17:20:40 -07:00
em_cmp.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
em_ipset.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_ipt.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_meta.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_nbyte.c	net: sched: Return the correct errno code	2021-02-06 11:15:28 -08:00
em_text.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
em_u32.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
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: avoid duplicates in classes dump	2021-03-04 14:27:47 -08:00
sch_atm.c	net: sched: Add extack to Qdisc_class_ops.delete	2021-01-22 20:41:29 -08: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	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
sch_cbq.c	net: sched: Mundane typo fixes	2021-03-24 15:09:11 -07: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: Add extack to Qdisc_class_ops.delete	2021-01-22 20:41:29 -08:00
sch_dsmark.c	sch_dsmark: fix a NULL deref in qdisc_reset()	2021-05-24 13:11:44 -07: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	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_fifo.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_fq_codel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
sch_fq_pie.c	net/sched: fq_pie: fix OOB access in the traffic path	2021-05-23 17:16:09 -07:00
sch_fq.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_frag.c	net/sched: sch_frag: fix stack OOB read while fragmenting IPv4 packets	2021-04-29 15:31:53 -07:00
sch_generic.c	mlx5: count all link events	2021-06-03 13:10:17 -07:00
sch_gred.c	net: sched: Fix spelling mistakes	2021-05-31 22:44:56 -07:00
sch_hfsc.c	net: sched: Add extack to Qdisc_class_ops.delete	2021-01-22 20:41:29 -08: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	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2021-06-07 13:01:52 -07:00
sch_ingress.c	net: sched: Pass ingress block to tcf_classify_ingress	2020-02-19 17:49:48 -08:00
sch_mq.c	net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues	2019-12-03 11:53:55 -08:00
sch_mqprio.c	mqprio: Fix out-of-bounds access in mqprio_dump	2019-12-06 11:58:45 -08:00
sch_multiq.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_netem.c	netem: fix zero division in tabledist	2020-10-29 11:45:47 -07: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	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_qfq.c	net: sched: Add extack to Qdisc_class_ops.delete	2021-01-22 20:41:29 -08:00
sch_red.c	net: sched: validate stab values	2021-03-10 15:47:52 -08:00
sch_sfb.c	net: sched: Add extack to Qdisc_class_ops.delete	2021-01-22 20:41:29 -08:00
sch_sfq.c	net: sched: validate stab values	2021-03-10 15:47:52 -08: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: taprio offload: enforce qdisc to netdev queue mapping	2021-05-13 13:08:00 -07:00
sch_tbf.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_teql.c	net: sched: sch_teql: fix null-pointer dereference	2021-04-08 14:14:42 -07:00