Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607b0b1c authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman
Browse files

flow_dissector: Fix port range key handling in BPF conversion 



[ Upstream commit 69ab34f705fbfabcace64b5d53bb7a4450fac875 ]

Fix how port range keys are handled in __skb_flow_bpf_to_target() by:
- Separating PORTS and PORTS_RANGE key handling
- Using correct key_ports_range structure for range keys
- Properly initializing both key types independently

This ensures port range information is correctly stored in its dedicated
structure rather than incorrectly using the regular ports key structure.

Fixes: 59fb9b62fb6c ("flow_dissector: Fix to use new variables for port ranges in bpf hook")
Reported-by: default avatarQiang Zhang <dtzq01@gmail.com>
Closes: https://lore.kernel.org/netdev/CAPx+-5uvFxkhkz4=j_Xuwkezjn9U6kzKTD5jz4tZ9msSJ0fOJA@mail.gmail.com/


Cc: Yoshiki Komachi <komachi.yoshiki@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Link: https://patch.msgid.link/20250218043210.732959-4-xiyou.wangcong@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c67e2356

net/core/flow_dissector.c

+10 −8
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys, 
				     struct flow_dissector *flow_dissector,

				     void *target_container)

{

	struct flow_dissector_key_ports_range *key_ports_range = NULL;

	struct flow_dissector_key_ports *key_ports = NULL;

	struct flow_dissector_key_control *key_control;

	struct flow_dissector_key_basic *key_basic;
@@ -825,20 +826,21 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys, 
		key_control->addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;

	}



	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS))

	if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS)) {

		key_ports = skb_flow_dissector_target(flow_dissector,

						      FLOW_DISSECTOR_KEY_PORTS,

						      target_container);

	else if (dissector_uses_key(flow_dissector,

				    FLOW_DISSECTOR_KEY_PORTS_RANGE))

		key_ports = skb_flow_dissector_target(flow_dissector,

						      FLOW_DISSECTOR_KEY_PORTS_RANGE,

						      target_container);



	if (key_ports) {

		key_ports->src = flow_keys->sport;

		key_ports->dst = flow_keys->dport;

	}

	if (dissector_uses_key(flow_dissector,

			       FLOW_DISSECTOR_KEY_PORTS_RANGE)) {

		key_ports_range = skb_flow_dissector_target(flow_dissector,

							    FLOW_DISSECTOR_KEY_PORTS_RANGE,

							    target_container);

		key_ports_range->tp.src = flow_keys->sport;

		key_ports_range->tp.dst = flow_keys->dport;

	}



	if (dissector_uses_key(flow_dissector,

			       FLOW_DISSECTOR_KEY_FLOW_LABEL)) {