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

Commit 1fe4b118 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: ipv4: Set addr_type in hash_keys for forwarded case 



The result of the skb flow dissect is copied from keys to hash_keys to
ensure only the intended data is hashed. The original L4 hash patch
overlooked setting the addr_type for this case; add it.

Fixes: bf4e0a3d ("net: ipv4: add support for ECMP hash policy choice")
Reported-by: default avatarIdo Schimmel <idosch@idosch.org>
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 350c9f48

net/ipv4/route.c

+2 −0
Original line number Diff line number Diff line
@@ -1826,6 +1826,8 @@ int fib_multipath_hash(const struct fib_info *fi, const struct flowi4 *fl4, 
				return skb_get_hash_raw(skb) >> 1;

			memset(&hash_keys, 0, sizeof(hash_keys));

			skb_flow_dissect_flow_keys(skb, &keys, flag);



			hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;

			hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src;

			hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst;

			hash_keys.ports.src = keys.ports.src;