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

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

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

    batman-adv: Place kref_get for bla_backbone_gw 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/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index b0517a0..1db3c12 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -526,11 +526,9 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig,
 	atomic_set(&entry->wait_periods, 0);
 	ether_addr_copy(entry->orig, orig);
 	INIT_WORK(&entry->report_work, batadv_bla_loopdetect_report);
-	/* one for the hash, one for returning */
-	kref_get(&entry->refcount);
+	kref_get(&entry->refcount);
 	hash_added = batadv_hash_add(bat_priv->bla.backbone_hash,
 				     batadv_choose_backbone_gw, entry,


More information about the linux-merge mailing list