batman-adv: Place kref_get for nc_path near use

It is hard to understand why the refcnt is increased when it isn't done
near the actual place the new reference is used. So using kref_get right
before the place which requires the reference and in the same function
helps to avoid accidental problems caused by incorrect reference counting.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 4f4cfe53f9730ce6192c1faab799798f45245657..165cd27777cbcb0cef2eecdda31c978264bb7285 100644 (file)
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -978,7 +978,6 @@ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv,
        INIT_LIST_HEAD(&nc_path->packet_list);
        spin_lock_init(&nc_path->packet_list_lock);
        kref_init(&nc_path->refcount);
-       kref_get(&nc_path->refcount);
        nc_path->last_valid = jiffies;
        ether_addr_copy(nc_path->next_hop, dst);
        ether_addr_copy(nc_path->prev_hop, src);
@@ -988,6 +987,7 @@ static struct batadv_nc_path *batadv_nc_get_path(struct batadv_priv *bat_priv,
                   nc_path->next_hop);
 
        /* Add nc_path to hash table */
+       kref_get(&nc_path->refcount);
        hash_added = batadv_hash_add(hash, batadv_nc_hash_compare,
                                     batadv_nc_hash_choose, &nc_path_key,
                                     &nc_path->hash_entry);