48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From cdd09f69871ce8c98b8ae9fa0583f73938768943 Mon Sep 17 00:00:00 2001
|
|
From: Simon Wunderlich <simon@open-mesh.com>
|
|
Date: Wed, 26 Mar 2014 15:46:22 +0100
|
|
Subject: [PATCH 2/9] batman-adv: fix neigh reference imbalance
|
|
|
|
When an interface is removed from batman-adv, the orig_ifinfo of a
|
|
orig_node may be removed without releasing the router first.
|
|
This will prevent the reference for the neighbor pointed at by the
|
|
orig_ifinfo->router to be released, and this leak may result in
|
|
reference leaks for the interface used by this neighbor. Fix that.
|
|
|
|
This is a regression introduced by
|
|
de6bcc76ea84fecb136f8c8f5ba1862e4a13f06b ("batman-adv: split out router
|
|
from orig_node").
|
|
|
|
Reported-by: Antonio Quartulli <antonio@open-mesh.com>
|
|
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
---
|
|
originator.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/originator.c b/originator.c
|
|
index 8539416..25df60d 100644
|
|
--- a/originator.c
|
|
+++ b/originator.c
|
|
@@ -500,12 +500,17 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node,
|
|
static void batadv_orig_ifinfo_free_rcu(struct rcu_head *rcu)
|
|
{
|
|
struct batadv_orig_ifinfo *orig_ifinfo;
|
|
+ struct batadv_neigh_node *router;
|
|
|
|
orig_ifinfo = container_of(rcu, struct batadv_orig_ifinfo, rcu);
|
|
|
|
if (orig_ifinfo->if_outgoing != BATADV_IF_DEFAULT)
|
|
batadv_hardif_free_ref_now(orig_ifinfo->if_outgoing);
|
|
|
|
+ /* this is the last reference to this object */
|
|
+ router = rcu_dereference_protected(orig_ifinfo->router, true);
|
|
+ if (router)
|
|
+ batadv_neigh_node_free_ref_now(router);
|
|
kfree(orig_ifinfo);
|
|
}
|
|
|
|
--
|
|
2.0.0.rc2
|
|
|