diff options
author | Sven Eckelmann <sven@narfation.org> | 2016-03-05 10:09:21 -0500 |
---|---|---|
committer | Antonio Quartulli <a@unstable.cc> | 2016-05-10 06:28:29 -0400 |
commit | 0de32ceee156787429035c974316f4e5098cf722 (patch) | |
tree | d978fd69777dec71c9e423fd17d12135e5b37d0a /net/batman-adv/network-coding.c | |
parent | c9dad805e9f4fd3978f22c970bae49eaa00b46dd (diff) |
batman-adv: Use kref_get for batadv_nc_get_nc_node
batadv_nc_get_nc_node requires that the caller already has a valid
reference for orig_neigh_node. It is therefore not possible that it has an
reference counter of 0 and was still given to this function
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>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Diffstat (limited to 'net/batman-adv/network-coding.c')
-rw-r--r-- | net/batman-adv/network-coding.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 1da8e0e1b18f..953dff1ad43b 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c | |||
@@ -856,8 +856,7 @@ batadv_nc_get_nc_node(struct batadv_priv *bat_priv, | |||
856 | if (!nc_node) | 856 | if (!nc_node) |
857 | return NULL; | 857 | return NULL; |
858 | 858 | ||
859 | if (!kref_get_unless_zero(&orig_neigh_node->refcount)) | 859 | kref_get(&orig_neigh_node->refcount); |
860 | goto free; | ||
861 | 860 | ||
862 | /* Initialize nc_node */ | 861 | /* Initialize nc_node */ |
863 | INIT_LIST_HEAD(&nc_node->list); | 862 | INIT_LIST_HEAD(&nc_node->list); |
@@ -884,10 +883,6 @@ batadv_nc_get_nc_node(struct batadv_priv *bat_priv, | |||
884 | spin_unlock_bh(lock); | 883 | spin_unlock_bh(lock); |
885 | 884 | ||
886 | return nc_node; | 885 | return nc_node; |
887 | |||
888 | free: | ||
889 | kfree(nc_node); | ||
890 | return NULL; | ||
891 | } | 886 | } |
892 | 887 | ||
893 | /** | 888 | /** |