diff mbox

[v2] batman-adv: avoid double free when orig_node initialization fails

Message ID 1392427040-1614-1-git-send-email-antonio@meshcoding.com (mailing list archive)
State Accepted, archived
Commit d4acda1cb9cca135e7b91777bb2680518b3cffa0
Headers

Commit Message

Antonio Quartulli Feb. 15, 2014, 1:17 a.m. UTC 
  In the failure path of the orig_node initialization routine
the orig_node->bat_iv.bcast_own field is free'd twice: first
in batadv_iv_ogm_orig_get() and then later in
batadv_orig_node_free_rcu().

Fix it by removing the kfree in batadv_iv_ogm_orig_get().

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---

Change form v1:
- remove kfree from batadv_iv_ogm_orig_get() instead of setting
  orig_node->bat_iv.bcast_own to NULL


 bat_iv_ogm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Marek Lindner Feb. 15, 2014, 1:27 a.m. UTC | #1 
On Saturday 15 February 2014 02:17:20 Antonio Quartulli wrote:
> In the failure path of the orig_node initialization routine
> the orig_node->bat_iv.bcast_own field is free'd twice: first
> in batadv_iv_ogm_orig_get() and then later in
> batadv_orig_node_free_rcu().
> 
> Fix it by removing the kfree in batadv_iv_ogm_orig_get().
> 
> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
> ---
> 
> Change form v1:
> - remove kfree from batadv_iv_ogm_orig_get() instead of setting
>   orig_node->bat_iv.bcast_own to NULL
> 
> 
>  bat_iv_ogm.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Applied in revision d4acda1.

Thanks,
Marek
diff mbox

Patch

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index c07e59f..fdf4322 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -243,18 +243,16 @@  batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr)
 	size = bat_priv->num_ifaces * sizeof(uint8_t);
 	orig_node->bat_iv.bcast_own_sum = kzalloc(size, GFP_ATOMIC);
 	if (!orig_node->bat_iv.bcast_own_sum)
-		goto free_bcast_own;
+		goto free_orig_node;
 
 	hash_added = batadv_hash_add(bat_priv->orig_hash, batadv_compare_orig,
 				     batadv_choose_orig, orig_node,
 				     &orig_node->hash_entry);
 	if (hash_added != 0)
-		goto free_bcast_own;
+		goto free_orig_node;
 
 	return orig_node;
 
-free_bcast_own:
-	kfree(orig_node->bat_iv.bcast_own);
 free_orig_node:
 	/* free twice, as batadv_orig_node_new sets refcount to 2 */
 	batadv_orig_node_free_ref(orig_node);