diff mbox

batman-adv: check batadv_orig_hash_add_if() return code

Message ID 1341175915-26856-1-git-send-email-siwu@hrz.tu-chemnitz.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Simon Wunderlich July 1, 2012, 8:51 p.m. UTC 
  If this call fails, some of the orig_nodes spaces may have been
resized for the increased number of interface, and some may not.
If we would just continue with the larger number of interfaces,
this would lead to access to not allocated memory later.

We better check the return code, and don't add the interface if
no memory is available. OTOH, keeping some of the orig_nodes
with too much memory allocated should hurt no one (except for
a few too many bytes allocated).

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
---
 hard-interface.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Marek Lindner July 5, 2012, 9:47 p.m. UTC | #1 
On Sunday, July 01, 2012 22:51:55 Simon Wunderlich wrote:
> If this call fails, some of the orig_nodes spaces may have been
> resized for the increased number of interface, and some may not.
> If we would just continue with the larger number of interfaces,
> this would lead to access to not allocated memory later.
> 
> We better check the return code, and don't add the interface if
> no memory is available. OTOH, keeping some of the orig_nodes
> with too much memory allocated should hurt no one (except for
> a few too many bytes allocated).
> 
> Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
> ---
>  hard-interface.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Applied in revision c4499bb.

Thanks,
Marek
diff mbox

Patch

diff --git a/hard-interface.c b/hard-interface.c
index 282bf6e..2d7f4f2 100644
--- a/hard-interface.c
+++ b/hard-interface.c
@@ -313,7 +313,12 @@  int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
 	hard_iface->if_num = bat_priv->num_ifaces;
 	bat_priv->num_ifaces++;
 	hard_iface->if_status = BATADV_IF_INACTIVE;
-	batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
+	ret = batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
+	if (ret < 0) {
+		bat_priv->bat_algo_ops->bat_iface_disable(hard_iface);
+		bat_priv->num_ifaces--;
+		goto err_dev;
+	}
 
 	hard_iface->batman_adv_ptype.type = ethertype;
 	hard_iface->batman_adv_ptype.func = batadv_batman_skb_recv;