evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

batman-adv: avoid double free when orig_node initialization fails

Browse source 
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>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
This commit is contained in:
Antonio Quartulli 2014-02-15 02:17:20 +01:00
parent 05c3c8a636
commit a5a5cb8cab
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/batman-adv/bat_iv_ogm.c
View file

@ -241,18 +241,16 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr)
size = bat_priv->num_ifaces * sizeof(uint8_t); size = bat_priv->num_ifaces * sizeof(uint8_t);
orig_node->bat_iv.bcast_own_sum = kzalloc(size, GFP_ATOMIC); orig_node->bat_iv.bcast_own_sum = kzalloc(size, GFP_ATOMIC);
if (!orig_node->bat_iv.bcast_own_sum) 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, hash_added = batadv_hash_add(bat_priv->orig_hash, batadv_compare_orig,
batadv_choose_orig, orig_node, batadv_choose_orig, orig_node,
&orig_node->hash_entry); &orig_node->hash_entry);
if (hash_added != 0) if (hash_added != 0)
goto free_bcast_own; goto free_orig_node;
return orig_node; return orig_node;
free_bcast_own:
kfree(orig_node->bat_iv.bcast_own);
free_orig_node: free_orig_node:
/* free twice, as batadv_orig_node_new sets refcount to 2 */ /* free twice, as batadv_orig_node_new sets refcount to 2 */
batadv_orig_node_free_ref(orig_node); batadv_orig_node_free_ref(orig_node);