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

batman at open-mesh.org batman at open-mesh.org
Fri May 13 00:15:41 CEST 2016


The following commit has been merged in the master branch:
commit c9dad805e9f4fd3978f22c970bae49eaa00b46dd
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Mar 5 16:09:20 2016 +0100

    batman-adv: Use kref_get for batadv_tvlv_container_get
    
    batadv_tvlv_container_get requires that tvlv.container_list_lock is held by
    the caller. It is therefore not possible that an item in
    tvlv.container_list has an reference counter of 0 and is still in the list
    
    The kref_get function instead WARNs (with debug information) when the
    reference counter would still be 0. This makes a bug in batman-adv better
    visible because kref_get_unless_zero would have ignored this problem.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index c8d8bc7..5f2974b 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -748,9 +748,7 @@ batadv_tvlv_container_get(struct batadv_priv *bat_priv, u8 type, u8 version)
 		if (tvlv_tmp->tvlv_hdr.version != version)
 			continue;
 
-		if (!kref_get_unless_zero(&tvlv_tmp->refcount))
-			continue;
-
+		kref_get(&tvlv_tmp->refcount);
 		tvlv = tvlv_tmp;
 		break;
 	}

-- 
LinuxNextTracking


More information about the linux-merge mailing list