lkml.org 
[lkml]   [2018]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 066/122] net: ipv4: Set addr_type in hash_keys for forwarded case
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: David Ahern <dsahern@gmail.com>


    [ Upstream commit 1fe4b1184c2ae2bfbf9e8b14c9c0c1945c98f205 ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/route.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/net/ipv4/route.c
    +++ b/net/ipv4/route.c
    @@ -1832,6 +1832,8 @@ int fib_multipath_hash(const struct fib_
    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;

    \
     
     \ /
      Last update: 2018-03-07 21:39    [W:4.075 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site