[5/9] batman-adv: Use kref_get for batadv_tvlv_container_get

Message ID 1457190564-11419-5-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 21a288fb1b87d11a48d7605b8e00eddee8ed1cf8
Delegated to: Marek Lindner
Headers

Commit Message

Sven Eckelmann March 5, 2016, 3:09 p.m. UTC
  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@narfation.org>
---
 net/batman-adv/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Comments

Marek Lindner April 11, 2016, 10:18 a.m. UTC | #1
On Saturday, March 05, 2016 16:09:20 Sven Eckelmann wrote:
> 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@narfation.org>
> ---
>  net/batman-adv/main.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Applied in revision 21a288f.

Thanks,
Marek
  

Patch

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index bda5f13..1245a58 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -748,9 +748,7 @@  static struct batadv_tvlv_container
 		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;
 	}