lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 056/135] net/ipv6: Remove extra call to ip6_convert_metrics for multipath case
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: David Ahern <dsahern@gmail.com>

    [ Upstream commit 36f19d5b4f99fa9fa8263877e5f8e669d7fddc14 ]

    The change to move metrics from the dst to rt6_info moved the call
    to ip6_convert_metrics from ip6_route_add to ip6_route_info_create. In
    doing so it makes the call in ip6_route_info_append redundant and
    actually leaks the metrics installed as part of the ip6_route_info_create.
    Remove the now unnecessary call.

    Fixes: d4ead6b34b67f ("net/ipv6: move metrics from dst to rt6_info")
    Signed-off-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/route.c | 5 -----
    1 file changed, 5 deletions(-)

    --- a/net/ipv6/route.c
    +++ b/net/ipv6/route.c
    @@ -4314,11 +4314,6 @@ static int ip6_route_info_append(struct
    if (!nh)
    return -ENOMEM;
    nh->fib6_info = rt;
    - err = ip6_convert_metrics(net, rt, r_cfg);
    - if (err) {
    - kfree(nh);
    - return err;
    - }
    memcpy(&nh->r_cfg, r_cfg, sizeof(*r_cfg));
    list_add_tail(&nh->next, rt6_nh_list);


    \
     
     \ /
      Last update: 2018-10-16 19:45    [W:4.075 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site