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

    batman-adv: Place kref_get for neigh_ifinfo 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 8828964..5e99a6e 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -460,9 +460,9 @@ batadv_neigh_ifinfo_new(struct batadv_neigh_node *neigh,
-	kref_get(&neigh_ifinfo->refcount);
 	neigh_ifinfo->if_outgoing = if_outgoing;
+	kref_get(&neigh_ifinfo->refcount);
 	hlist_add_head_rcu(&neigh_ifinfo->list, &neigh->ifinfo_list);


More information about the linux-merge mailing list