lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 55/93] batman-adv: Fix orig_node_vlan leak on orig_node_release
    Date
    From: Sven Eckelmann <sven@narfation.org>

    commit 33fbb1f3db87ce53da925b3e034b4dd446d483f8 upstream.

    batadv_orig_node_new uses batadv_orig_node_vlan_new to allocate a new
    batadv_orig_node_vlan and add it to batadv_orig_node::vlan_list. References
    to this list have also to be cleaned when the batadv_orig_node is removed.

    Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific")
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/batman-adv/originator.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/net/batman-adv/originator.c
    +++ b/net/batman-adv/originator.c
    @@ -564,6 +564,7 @@ static void batadv_orig_node_release(str
    struct hlist_node *node_tmp;
    struct batadv_neigh_node *neigh_node;
    struct batadv_orig_ifinfo *orig_ifinfo;
    + struct batadv_orig_node_vlan *vlan;

    spin_lock_bh(&orig_node->neigh_list_lock);

    @@ -581,6 +582,13 @@ static void batadv_orig_node_release(str
    }
    spin_unlock_bh(&orig_node->neigh_list_lock);

    + spin_lock_bh(&orig_node->vlan_list_lock);
    + hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
    + hlist_del_rcu(&vlan->list);
    + batadv_orig_node_vlan_free_ref(vlan);
    + }
    + spin_unlock_bh(&orig_node->vlan_list_lock);
    +
    /* Free nc_nodes */
    batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);


    \
     
     \ /
      Last update: 2020-03-19 14:09    [W:4.397 / U:0.460 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site