lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 263/312] tipc: fix the error handling in tipc_udp_enable()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    commit a5de125dd46c851fc962806135953c1bd0a0f0df upstream.

    Fix to return a negative error code in enable_mcast() error handling
    case, and release udp socket when necessary.

    Fixes: d0f91938bede ("tipc: add ip/udp media type")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/tipc/udp_media.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/net/tipc/udp_media.c
    +++ b/net/tipc/udp_media.c
    @@ -405,10 +405,13 @@ static int tipc_udp_enable(struct net *n
    tuncfg.encap_destroy = NULL;
    setup_udp_tunnel_sock(net, ub->ubsock, &tuncfg);

    - if (enable_mcast(ub, remote))
    + err = enable_mcast(ub, remote);
    + if (err)
    goto err;
    return 0;
    err:
    + if (ub->ubsock)
    + udp_tunnel_sock_release(ub->ubsock);
    kfree(ub);
    return err;
    }

    \
     
     \ /
      Last update: 2020-05-08 15:15    [W:2.783 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site