[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 09537d1869499fb3eac710cc54e700602b6c66c9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 15 17:39:16 2016 +0200

    batman-adv: Place kref_get for orig_node_vlan 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 95c8555..5108af1 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -133,9 +133,9 @@ batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,
 		goto out;
 
 	kref_init(&vlan->refcount);
-	kref_get(&vlan->refcount);
 	vlan->vid = vid;
 
+	kref_get(&vlan->refcount);
 	hlist_add_head_rcu(&vlan->list, &orig_node->vlan_list);
 
 out:

-- 
LinuxNextTracking


More information about the linux-merge mailing list