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

Commit b3c3106c authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

flow_dissector: Use same pointer for IPv4 and IPv6 addresses 



The IPv6 parsing was using a local pointer when it could use the same
pointer as the IPv4 portion of the code since the key_addrs can support
both IPv4 and IPv6 as it is just a pointer.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Acked-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 224516b3

net/core/flow_dissector.c

+5 −6
Original line number Diff line number Diff line
@@ -220,13 +220,12 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 


		if (dissector_uses_key(flow_dissector,

				       FLOW_DISSECTOR_KEY_IPV6_ADDRS)) {

			struct flow_dissector_key_ipv6_addrs *key_ipv6_addrs;



			key_ipv6_addrs = skb_flow_dissector_target(flow_dissector,

			key_addrs = skb_flow_dissector_target(flow_dissector,

							      FLOW_DISSECTOR_KEY_IPV6_ADDRS,

							      target_container);



			memcpy(key_ipv6_addrs, &iph->saddr, sizeof(*key_ipv6_addrs));

			memcpy(&key_addrs->v6addrs, &iph->saddr,

			       sizeof(key_addrs->v6addrs));

			key_control->addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;

		}