gw_election may leak data from the rcu protected list of all gateway nodes outside the read-side critical area. This is not valid as we may free the data using a call_rcu created callback after we unlock using rcu_read_unlock. A workaround is to provide a reference count to be sure that the memory isn't freed to early.
It is currently only to implement the already existing functionality and doesn't provide the full tracking of all usage cases.
Additionally, we must gw_node_hold inside the rcu_read_lock()..rcu_read_unlock() before we attach to the structure which "leaks" it. When another function now removed it from its usage context (curr_gw, usage on stack, ...) then we must gw_node_put it. If it is decremented to zero then we can issue the call_rcu to the freeing function. So "put" is not allowed inside an rcu_read_lock.
Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de --- batman-adv/gateway_client.c | 19 +++++++++++++++++-- batman-adv/types.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/batman-adv/gateway_client.c b/batman-adv/gateway_client.c index bfac0ff..281da92 100644 --- a/batman-adv/gateway_client.c +++ b/batman-adv/gateway_client.c @@ -28,6 +28,19 @@ #include <linux/udp.h> #include <linux/if_vlan.h>
+static void gw_node_free(struct rcu_head *rcu); + +static void gw_node_hold(struct gw_node *gw_node) +{ + atomic_inc(&gw_node->refcnt); +} + +static void gw_node_put(struct gw_node *gw_node) +{ + if (atomic_dec_and_test(&gw_node->refcnt)) + call_rcu(&gw_node->rcu, gw_node_free); +} + void *gw_get_selected(struct bat_priv *bat_priv) { struct gw_node *curr_gateway_tmp = bat_priv->curr_gw; @@ -205,6 +218,8 @@ static void gw_node_add(struct bat_priv *bat_priv, memset(gw_node, 0, sizeof(struct gw_node)); INIT_HLIST_NODE(&gw_node->list); gw_node->orig_node = orig_node; + atomic_set(&gw_node->refcnt, 0); + gw_node_hold(gw_node);
spin_lock_irqsave(&bat_priv->gw_list_lock, flags); hlist_add_head_rcu(&gw_node->list, &bat_priv->gw_list); @@ -286,7 +301,7 @@ void gw_node_purge_deleted(struct bat_priv *bat_priv) (time_after(jiffies, gw_node->deleted + timeout))) {
hlist_del_rcu(&gw_node->list); - call_rcu(&gw_node->rcu, gw_node_free); + gw_node_put(gw_node); } }
@@ -304,7 +319,7 @@ void gw_node_list_free(struct bat_priv *bat_priv) hlist_for_each_entry_safe(gw_node, node, node_tmp, &bat_priv->gw_list, list) { hlist_del_rcu(&gw_node->list); - call_rcu(&gw_node->rcu, gw_node_free); + gw_node_put(gw_node); }
gw_deselect(bat_priv); diff --git a/batman-adv/types.h b/batman-adv/types.h index e7b53a4..a088064 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -96,6 +96,7 @@ struct gw_node { struct hlist_node list; struct orig_node *orig_node; unsigned long deleted; + atomic_t refcnt; struct rcu_head rcu; };