Commit f69ae770 authored Apr 17, 2013 by Martin Hundebøll Committed by Antonio Quartulli May 21, 2013

batman-adv: Avoid double freeing of bat_counters

On errors in batadv_mesh_init(), bat_counters will be freed in both
batadv_mesh_free() and batadv_softif_init_late(). This patch fixes this
by returning earlier from batadv_softif_init_late() in case of errors in
batadv_mesh_init() and by setting bat_counters to NULL after freeing.

Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

parent 3ccfc1b1

net/batman-adv/main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
		batadv_originator_free(bat_priv);

		free_percpu(bat_priv->bat_counters);
		bat_priv->bat_counters = NULL;

		atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
		}

net/batman-adv/soft-interface.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -505,6 +505,7 @@ unreg_debugfs:
		batadv_debugfs_del_meshif(dev);
		free_bat_counters:
		free_percpu(bat_priv->bat_counters);
		bat_priv->bat_counters = NULL;

		return ret;
		}

Admin message