lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

Browse Source 
Included change:
- fix double free in case of failure during mesh initialisation

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2013-05-23 00:08:36 -07:00
parent c573972c11 f69ae770e7
commit d02cea0f43
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/batman-adv/main.c
View File

@@ -181,6 +181,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
batadv_originator_free(bat_priv); batadv_originator_free(bat_priv);
free_percpu(bat_priv->bat_counters); free_percpu(bat_priv->bat_counters);
bat_priv->bat_counters = NULL;
atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
} }

1
net/batman-adv/soft-interface.c
View File

@@ -505,6 +505,7 @@ unreg_debugfs:
batadv_debugfs_del_meshif(dev); batadv_debugfs_del_meshif(dev);
free_bat_counters: free_bat_counters:
free_percpu(bat_priv->bat_counters); free_percpu(bat_priv->bat_counters);
bat_priv->bat_counters = NULL;
return ret; return ret;
} }