batman-adv/patches/0007-batman-adv-Avoid-double-freeing-of-bat_counters.patch

   1 From a5d79639a76d7a71116abbc369a246bd1fcbf947 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@hundeboll.net>
   3 Date: Wed, 17 Apr 2013 21:13:16 +0200
   4 Subject: [PATCH 07/10] batman-adv: Avoid double freeing of bat_counters
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 On errors in batadv_mesh_init(), bat_counters will be freed in both
  10 batadv_mesh_free() and batadv_softif_init_late(). This patch fixes this
  11 by returning earlier from batadv_softif_init_late() in case of errors in
  12 batadv_mesh_init() and by setting bat_counters to NULL after freeing.
  13
  14 Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
  15 Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  16 ---
  17  main.c           |    1 +
  18  soft-interface.c |    1 +
  19  2 files changed, 2 insertions(+)
  20
  21 diff --git a/main.c b/main.c
  22 index 1240f07..51aafd6 100644
  23 --- a/main.c
  24 +++ b/main.c
  25 @@ -181,6 +181,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
  26         batadv_originator_free(bat_priv);
  27
  28         free_percpu(bat_priv->bat_counters);
  29 +       bat_priv->bat_counters = NULL;
  30
  31         atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
  32  }
  33 diff --git a/soft-interface.c b/soft-interface.c
  34 index 6f20d33..819dfb0 100644
  35 --- a/soft-interface.c
  36 +++ b/soft-interface.c
  37 @@ -505,6 +505,7 @@ unreg_debugfs:
  38         batadv_debugfs_del_meshif(dev);
  39  free_bat_counters:
  40         free_percpu(bat_priv->bat_counters);
  41 +       bat_priv->bat_counters = NULL;
  42
  43         return ret;
  44  }
  45 --
  46 1.7.10.4
  47