diff options
| author | David Ahern <dsahern@gmail.com> | 2018-02-21 20:00:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-22 20:30:51 +0100 |
| commit | 1fe4b1184c2ae2bfbf9e8b14c9c0c1945c98f205 (patch) | |
| tree | bb8a53b6a565b573bcfbff713003782bb9d27c5f /net/ipv4/route.c | |
| parent | tcp_bbr: better deal with suboptimal GSO (diff) | |
| download | linux-1fe4b1184c2ae2bfbf9e8b14c9c0c1945c98f205.tar.xz linux-1fe4b1184c2ae2bfbf9e8b14c9c0c1945c98f205.zip | |
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: bf4e0a3db97eb ("net: ipv4: add support for ECMP hash policy choice")
Reported-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 49cc1c1df1ba..a4f44d815a61 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -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; |