[linux-next] LinuxNextTracking branch, master, updated. next-20160824

batman at open-mesh.org batman at open-mesh.org
Thu Aug 25 00:15:41 CEST 2016

The following commit has been merged in the master branch:
commit 8427445886d23729cc41305cef580605202f01db
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 15 17:39:20 2016 +0200

    batman-adv: Place kref_get for neigh_node 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 at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 5e99a6e..0792de8 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -654,8 +654,8 @@ batadv_neigh_node_create(struct batadv_orig_node *orig_node,
 	/* extra reference for return */
-	kref_get(&neigh_node->refcount);
+	kref_get(&neigh_node->refcount);
 	hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list);
 	batadv_dbg(BATADV_DBG_BATMAN, orig_node->bat_priv,


More information about the linux-merge mailing list