Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit a424cd5a2c956ef1f0353d7e5f2b7fbc4af7d2d8 Author: Simon Wunderlich simon@open-mesh.com Date: Wed Mar 26 15:46:21 2014 +0100

batman-adv: fix neigh_ifinfo imbalance

The neigh_ifinfo object must be freed if it has been used in batadv_iv_ogm_process_per_outif().

This is a regression introduced by 9bb33b8d88e318c4879d37d06ad28e3e018b9036 ("batman-adv: split tq information in neigh_node struct")

Reported-by: Antonio Quartulli antonio@open-mesh.com Signed-off-by: Simon Wunderlich simon@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

a424cd5a2c956ef1f0353d7e5f2b7fbc4af7d2d8 bat_iv_ogm.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 8323bce..d074d06 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1545,6 +1545,8 @@ out_neigh: if ((orig_neigh_node) && (!is_single_hop_neigh)) batadv_orig_node_free_ref(orig_neigh_node); out: + if (router_ifinfo) + batadv_neigh_ifinfo_free_ref(router_ifinfo); if (router) batadv_neigh_node_free_ref(router); if (router_router)