summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2016-07-15 17:39:24 +0200
committerSimon Wunderlich <sw@simonwunderlich.de>2016-08-09 07:54:48 +0200
commit7282ac396ea617a0a4f8f89389f84690f8431d7d (patch)
tree9ddfa3a623af6645d2aca51abbd612a3628cce4d /net/batman-adv
parent15d5ffdea0ddfa78609b1587851b13d9137fbbcd (diff)
downloadlinux-stable-7282ac396ea617a0a4f8f89389f84690f8431d7d.tar.gz
linux-stable-7282ac396ea617a0a4f8f89389f84690f8431d7d.tar.bz2
linux-stable-7282ac396ea617a0a4f8f89389f84690f8431d7d.zip
batman-adv: Place kref_get for bla_claim 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@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/bridge_loop_avoidance.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 35ed1d32bab5..b0517a0bc8e7 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -718,12 +718,13 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
claim->lasttime = jiffies;
kref_get(&backbone_gw->refcount);
claim->backbone_gw = backbone_gw;
-
kref_init(&claim->refcount);
- kref_get(&claim->refcount);
+
batadv_dbg(BATADV_DBG_BLA, bat_priv,
"bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
mac, BATADV_PRINT_VID(vid));
+
+ kref_get(&claim->refcount);
hash_added = batadv_hash_add(bat_priv->bla.claim_hash,
batadv_compare_claim,
batadv_choose_claim, claim,