lkml.org 
[lkml]   [2018]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 45/66] tipc: fix a memory leak in tipc_nl_node_get_link()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Cong Wang <xiyou.wangcong@gmail.com>


    [ Upstream commit 59b36613e85fb16ebf9feaf914570879cd5c2a21 ]

    When tipc_node_find_by_name() fails, the nlmsg is not
    freed.

    While on it, switch to a goto label to properly
    free it.

    Fixes: be9c086715c ("tipc: narrow down exposure of struct tipc_node")
    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Cc: Jon Maloy <jon.maloy@ericsson.com>
    Cc: Ying Xue <ying.xue@windriver.com>
    Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
    Acked-by: Ying Xue <ying.xue@windriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/tipc/node.c | 26 ++++++++++++++------------
    1 file changed, 14 insertions(+), 12 deletions(-)

    --- a/net/tipc/node.c
    +++ b/net/tipc/node.c
    @@ -1848,36 +1848,38 @@ int tipc_nl_node_get_link(struct sk_buff

    if (strcmp(name, tipc_bclink_name) == 0) {
    err = tipc_nl_add_bc_link(net, &msg);
    - if (err) {
    - nlmsg_free(msg.skb);
    - return err;
    - }
    + if (err)
    + goto err_free;
    } else {
    int bearer_id;
    struct tipc_node *node;
    struct tipc_link *link;

    node = tipc_node_find_by_name(net, name, &bearer_id);
    - if (!node)
    - return -EINVAL;
    + if (!node) {
    + err = -EINVAL;
    + goto err_free;
    + }

    tipc_node_read_lock(node);
    link = node->links[bearer_id].link;
    if (!link) {
    tipc_node_read_unlock(node);
    - nlmsg_free(msg.skb);
    - return -EINVAL;
    + err = -EINVAL;
    + goto err_free;
    }

    err = __tipc_nl_add_link(net, &msg, link, 0);
    tipc_node_read_unlock(node);
    - if (err) {
    - nlmsg_free(msg.skb);
    - return err;
    - }
    + if (err)
    + goto err_free;
    }

    return genlmsg_reply(msg.skb, info);
    +
    +err_free:
    + nlmsg_free(msg.skb);
    + return err;
    }

    int tipc_nl_node_reset_link_stats(struct sk_buff *skb, struct genl_info *info)

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