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
..
9p	net/p9: load default transports	2022-01-10 10:00:09 +09:00
bluetooth	Networking changes for 5.18.	2022-03-24 13:13:26 -07:00
caif	…
iucv	net/af_iucv: Use struct_group() to zero struct iucv_sock region	2021-11-19 11:52:25 +00:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-23 10:53:49 -07:00
netns	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/	2022-03-19 14:49:08 +00:00
nfc	NFC: add NCI_UNREG flag to eliminate the race	2021-11-17 20:17:05 -08:00
phonet	…
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-01-05 14:36:10 -08:00
tc_act	net/sched: fix incorrect vlan_push_eth dest field	2022-03-23 10:32:48 -07:00
6lowpan.h	…
Space.h	…
act_api.h	flow_offload: validate flags of filter and actions	2021-12-19 14:08:48 +00:00
addrconf.h	net: Add new protocol attribute to IP addresses	2022-02-18 21:20:06 -08:00
af_ieee802154.h	…
af_rxrpc.h	…
af_unix.h	af_unix: Replace the big lock with small locks.	2021-11-26 18:01:58 -08:00
af_vsock.h	vsock: each transport cycles only on its own sockets	2022-03-11 23:14:19 -08:00
ah.h	…
amt.h	…
arp.h	ipv4: Invalidate neighbour for broadcast address upon address addition	2022-02-21 11:44:30 +00:00
atmclip.h	…
ax25.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-03 17:36:16 -08:00
ax88796.h	…
bareudp.h	bareudp: Move definition of struct bareudp_conf to bareudp.c	2021-12-13 12:34:09 +00:00
bond_3ad.h	bonding: fix data-races around agg_select_timer	2022-02-15 14:35:18 +00:00
bond_alb.h	bonding: make tx_rebalance_counter an atomic	2021-12-03 14:16:48 +00:00
bond_options.h	bonding: add new option ns_ip6_target	2022-02-21 12:13:45 +00:00
bonding.h	net: add per-cpu storage and net->core_stats	2022-03-11 23:17:24 -08:00
bpf_sk_storage.h	…
busy_poll.h	tcp: fix another uninit-value (sk_rx_queue_mapping)	2021-12-03 14:15:49 +00:00
calipso.h	…
cfg80211-wext.h	…
cfg80211.h	cfg80211: Support configuration of station EHT capabilities	2022-02-16 15:43:25 +01:00
cfg802154.h	net: ieee802154: Provide a kdoc to the address structure	2022-02-01 21:03:48 +01:00
checksum.h	powerpc/net: Implement powerpc specific csum_shift() to remove branch	2022-03-11 10:57:22 +00:00
cipso_ipv4.h	…
cls_cgroup.h	…
codel.h	codel: remove unnecessary pkt_sched.h include	2021-12-22 15:03:51 -08:00
codel_impl.h	codel: remove unnecessary sock.h include	2021-12-22 15:03:47 -08:00
codel_qdisc.h	codel: remove unnecessary pkt_sched.h include	2021-12-22 15:03:51 -08:00
compat.h	…
datalink.h	…
dcbevent.h	…
dcbnl.h	…
devlink.h	devlink: add explicitly locked flavor of the rate node APIs	2022-03-21 14:11:38 +00:00
dn.h	…
dn_dev.h	…
dn_fib.h	…
dn_neigh.h	…
dn_nsp.h	…
dn_route.h	…
dsa.h	net: dsa: pass extack to dsa_switch_ops :: port_mirror_add()	2022-03-17 17:42:47 -07:00
dsfield.h	…
dst.h	net: dst: add net device refcount tracking to dst_entry	2021-12-06 16:05:10 -08:00
dst_cache.h	wireguard: device: reset peer src endpoint when netns exits	2021-11-29 19:50:45 -08:00
dst_metadata.h	net: fix a memleak when uncloning an skb dst and its metadata	2022-02-09 11:41:47 +00:00
dst_ops.h	…
erspan.h	…
esp.h	esp: Fix possible buffer overflow in ESP transformation	2022-03-07 13:14:03 +01:00
espintcp.h	…
ethoc.h	…
failover.h	net: failover: add net device refcount tracker	2021-12-06 16:06:02 -08:00
fib_notifier.h	…
fib_rules.h	fib: expand fib_rule_policy	2021-12-16 07:18:35 -08:00
firewire.h	…
flow.h	net: Add l3mdev index to flow struct and avoid oif reset for port devices	2022-03-15 20:20:02 -07:00
flow_dissector.h	net/sched: flower: fix parsing of ethertype following VLAN header	2022-04-08 12:07:37 +01:00
flow_offload.h	net/sched: add vlan push_eth and pop_eth action to the hardware IR	2022-03-16 19:59:36 -07:00
fou.h	…
fq.h	…
fq_impl.h	…
garp.h	…
gen_stats.h	…
genetlink.h	…
geneve.h	…
gre.h	…
gro.h	net: gro: Fix a 'directive in macro's argument list' sparse warning	2022-02-18 11:00:25 +00:00
gro_cells.h	…
gtp.h	gtp: Add support for checking GTP device type	2022-03-11 08:28:27 -08:00
gue.h	…
hwbm.h	…
icmp.h	…
ieee80211_radiotap.h	ieee80211: radiotap: fix -Wcast-qual warnings	2022-02-04 16:25:21 +01:00
ieee802154_netdev.h	…
if_inet6.h	net: Add new protocol attribute to IP addresses	2022-02-18 21:20:06 -08:00
ife.h	…
ila.h	…
inet6_connection_sock.h	…
inet6_hashtables.h	…
inet_common.h	…
inet_connection_sock.h	tcp: Use BPF timeout setting for SYN ACK RTO	2022-02-02 14:45:18 +00:00
inet_dscp.h	ipv6: Define dscp_t and stop taking ECN bits into account in fib6-rules	2022-02-07 20:12:45 -08:00
inet_ecn.h	…
inet_frag.h	net: ip: Handle delivery_time in ip defrag	2022-03-03 14:38:48 +00:00
inet_hashtables.h	…
inet_sock.h	ipv4/raw: support binding to nonlocal addresses	2021-11-17 20:21:52 -08:00
inet_timewait_sock.h	tcp/dccp: get rid of inet_twsk_purge()	2022-01-25 11:25:21 +00:00
inetpeer.h	…
ioam6.h	treewide: Replace zero-length arrays with flexible-array members	2022-02-17 07:00:39 -06:00
ip.h	ipv4: Make ip_idents_reserve static	2022-01-31 11:33:10 +00:00
ip6_checksum.h	net: move gro definitions to include/net/gro.h	2021-11-16 13:16:54 +00:00
ip6_fib.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-17 11:44:20 -08:00
ip6_route.h	ipv6: ip6_skb_dst_mtu() cleanups	2021-11-19 20:09:55 -08:00
ip6_tunnel.h	ipv6: add net device refcount tracker to struct ip6_tnl	2021-12-06 16:05:11 -08:00
ip_fib.h	ipv4: Reject routes specifying ECN bits in rtm_tos	2022-02-07 20:12:46 -08:00
ip_tunnels.h	sit: add net device refcount tracking to ip_tunnel	2021-12-06 16:05:11 -08:00
ip_vs.h	…
ipcomp.h	…
ipconfig.h	…
ipv6.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-17 11:44:20 -08:00
ipv6_frag.h	net: don't include ndisc.h from ipv6.h	2022-02-04 14:15:11 -08:00
ipv6_stubs.h	net: ipv6: add fib6_nh_release_dsts stub	2021-11-22 15:44:49 +00:00
iw_handler.h	…
kcm.h	…
l3mdev.h	…
lag.h	…
lapb.h	…
lib80211.h	…
llc.h	llc: fix out-of-bound array index in llc_sk_dev_hash()	2021-11-07 19:25:29 +00:00
llc_c_ac.h	…
llc_c_ev.h	…
llc_c_st.h	…
llc_conn.h	llc: add net device refcount tracker	2021-12-07 20:44:59 -08:00
llc_if.h	…
llc_pdu.h	…
llc_s_ac.h	…
llc_s_ev.h	…
llc_s_st.h	…
llc_sap.h	…
lwtunnel.h	…
mac80211.h	mac80211: MBSSID beacon handling in AP mode	2022-03-15 11:36:26 +01:00
mac802154.h	net: mac802154: Explain the use of ieee802154_wake/stop_queue()	2022-01-28 11:23:41 +01:00
macsec.h	…
mctp.h	mctp: Use output netdev to allocate skb headroom	2022-04-01 12:04:15 +01:00
mctpdevice.h	…
mip6.h	…
mld.h	…
mpls.h	…
mpls_iptunnel.h	…
mptcp.h	mptcp: mptcp_parse_option is no longer exported	2022-02-16 20:52:04 -08:00
mrp.h	…
ncsi.h	…
ndisc.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
neighbour.h	net, neigh: Do not trigger immediate probes on NUD_FAILED from neigh_managed_work	2022-02-02 20:30:18 -08:00
net_failover.h	…
net_namespace.h	net: make net->dev_unreg_count atomic	2022-02-10 15:30:26 +00:00
net_ratelimit.h	…
net_trackers.h	net: add networking namespace refcount tracker	2021-12-10 06:38:26 -08:00
netevent.h	…
netlabel.h	…
netlink.h	…
netprio_cgroup.h	…
netrom.h	…
nexthop.h	…
nl802154.h	net: ieee802154: handle iftypes as u32	2021-11-16 18:02:46 +01:00
nsh.h	…
p8022.h	…
page_pool.h	page_pool: Add function to batch and return stats	2022-03-03 09:55:28 +00:00
pie.h	…
ping.h	…
pkt_cls.h	net/sched: Enable tc skb ext allocation on chain miss only when needed	2022-02-05 10:12:53 +00:00
pkt_sched.h	net: sched: remove psched_tdiff_bounded()	2022-01-27 13:53:27 +00:00
pptp.h	…
protocol.h	…
psample.h	…
psnap.h	…
raw.h	…
rawv6.h	…
red.h	…
regulatory.h	…
request_sock.h	tcp: Use BPF timeout setting for SYN ACK RTO	2022-02-02 14:45:18 +00:00
rose.h	…
route.h	ipv4: remove sparse error in ip_neigh_gw4()	2022-01-27 08:38:33 -08:00
rpl.h	…
rsi_91x.h	…
rtnetlink.h	…
rtnh.h	…
sch_generic.h	net: sched: remove qdisc_qlen_cpu()	2022-01-27 13:53:27 +00:00
scm.h	…
secure_seq.h	…
seg6.h	udp6: Use Segment Routing Header for dest address if present	2022-01-04 12:17:35 +00:00
seg6_hmac.h	…
seg6_local.h	…
selftests.h	…
slhc_vj.h	…
smc.h	…
snmp.h	…
sock.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-24 17:54:25 -08:00
sock_reuseport.h	…
stp.h	…
strparser.h	bpf, sockmap: sk_skb data_end access incorrect when src_reg = dst_reg	2021-11-09 01:05:34 +01:00
switchdev.h	net: bridge: mst: Notify switchdev drivers of MST state changes	2022-03-17 16:49:58 -07:00
tcp.h	net: tcp: fix shim definition of tcp_inbound_md5_hash	2022-03-09 08:44:40 -08:00
tcp_states.h	…
timewait_sock.h	…
tipc.h	…
tls.h	net/tls: Provide {__,}tls_driver_ctx() unconditionally	2022-03-09 20:01:14 -08:00
tls_toe.h	…
transp_v6.h	…
tso.h	…
tun_proto.h	…
udp.h	net: move gro definitions to include/net/gro.h	2021-11-16 13:16:54 +00:00
udp_tunnel.h	…
udplite.h	udplite: remove udplite_csum_outgoing()	2022-01-27 13:53:27 +00:00
vsock_addr.h	…
vxlan.h	drivers: vxlan: vnifilter: per vni stats	2022-03-01 08:38:02 +00:00
wext.h	…
x25.h	…
x25device.h	…
xdp.h	net: veth: Account total xdp_frame len running ndo_xdp_xmit	2022-03-17 20:33:52 +01:00
xdp_priv.h	xsk: Wipe out dead zero_copy_allocator declarations	2021-12-14 00:24:24 +01:00
xdp_sock.h	net: Don't include filter.h from net/sock.h	2021-12-29 08:48:14 -08:00
xdp_sock_drv.h	i40e: xsk: Move tmp desc array from driver to pool	2022-01-27 17:25:32 +01:00
xfrm.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/	2022-03-19 14:49:08 +00:00
xsk_buff_pool.h	i40e: xsk: Move tmp desc array from driver to pool	2022-01-27 17:25:32 +01:00