[08/10] batman-adv: don't access unregistered net_device object

Message ID 1440753156-7808-9-git-send-email-antonio@meshcoding.com (mailing list archive)
State Not Applicable, archived

Commit Message

Antonio Quartulli Aug. 28, 2015, 9:12 a.m. UTC
  In batadv_hardif_disable_interface() there is a call to
batadv_softif_destroy_sysfs() which in turns invokes
unregister_netdevice() on the soft_iface.
After this point we cannot rely on the soft_iface object
anymore because it might get free'd by the netdev periodic
routine at any time.

For this reason the netdev_upper_dev_unlink(.., soft_iface) call
is moved before the invocation of batadv_softif_destroy_sysfs() so
that we can be sure that the soft_iface object is still valid.

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
 net/batman-adv/hard-interface.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index f4a15d2..0565b20 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -528,6 +528,8 @@  void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
 	batadv_purge_outstanding_packets(bat_priv, hard_iface);
+	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
 	/* nobody uses this interface anymore */
 	if (!bat_priv->num_ifaces) {
@@ -536,7 +538,6 @@  void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
-	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
 	hard_iface->soft_iface = NULL;