lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 041/346] batman-adv: Free last_bonding_candidate on release of orig_node
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Sven Eckelmann <sven@narfation.org>

    commit cbef1e102003edb236c6b2319ab269ccef963731 upstream.

    The orig_ifinfo reference counter for last_bonding_candidate in
    batadv_orig_node has to be reduced when an originator node is released.
    Otherwise the orig_ifinfo is leaked and the reference counter the netdevice
    is not reduced correctly.

    Fixes: f3b3d9018975 ("batman-adv: add bonding again")
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
    [bwh: Backported to 3.16:
    - s/_put/_free_ref/
    - Adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/batman-adv/originator.c | 7 +++++++
    1 file changed, 7 insertions(+)

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

    spin_lock_bh(&orig_node->neigh_list_lock);

    @@ -545,8 +546,14 @@ static void batadv_orig_node_release(str
    hlist_del_rcu(&orig_ifinfo->list);
    batadv_orig_ifinfo_free_ref(orig_ifinfo);
    }
    +
    + last_candidate = orig_node->last_bonding_candidate;
    + orig_node->last_bonding_candidate = NULL;
    spin_unlock_bh(&orig_node->neigh_list_lock);

    + if (last_candidate)
    + batadv_orig_ifinfo_free_ref(last_candidate);
    +
    spin_lock_bh(&orig_node->vlan_list_lock);
    list_for_each_entry_safe(vlan, vlan_tmp, &orig_node->vlan_list, list) {
    list_del_rcu(&vlan->list);
    \
     
     \ /
      Last update: 2016-11-14 05:00    [W:4.019 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site