lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 040/109] libcxgb: fix error check for ip6_route_output()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Varun Prakash <varun@chelsio.com>


    [ Upstream commit a9a8cdb368d99bb655b5cdabea560446db0527cc ]

    ip6_route_output() never returns NULL so
    check dst->error instead of !dst.

    Signed-off-by: Varun Prakash <varun@chelsio.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    --- a/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c
    +++ b/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c
    @@ -133,17 +133,15 @@ cxgb_find_route6(struct cxgb4_lld_info *
    if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)
    fl6.flowi6_oif = sin6_scope_id;
    dst = ip6_route_output(&init_net, NULL, &fl6);
    - if (!dst)
    - goto out;
    - if (!cxgb_our_interface(lldi, get_real_dev,
    - ip6_dst_idev(dst)->dev) &&
    - !(ip6_dst_idev(dst)->dev->flags & IFF_LOOPBACK)) {
    + if (dst->error ||
    + (!cxgb_our_interface(lldi, get_real_dev,
    + ip6_dst_idev(dst)->dev) &&
    + !(ip6_dst_idev(dst)->dev->flags & IFF_LOOPBACK))) {
    dst_release(dst);
    - dst = NULL;
    + return NULL;
    }
    }

    -out:
    return dst;
    }
    EXPORT_SYMBOL(cxgb_find_route6);

    \
     
     \ /
      Last update: 2017-12-07 15:02    [W:4.118 / U:0.856 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site