| From foo@baz Wed May 28 21:03:54 PDT 2014 |
| From: Simon Wunderlich <simon@open-mesh.com> |
| Date: Wed, 26 Mar 2014 15:46:21 +0100 |
| Subject: batman-adv: fix neigh_ifinfo imbalance |
| |
| From: Simon Wunderlich <simon@open-mesh.com> |
| |
| [ Upstream commit c1e517fbbcdb13f50662af4edc11c3251fe44f86 ] |
| |
| 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 |
| 89652331c00f43574515059ecbf262d26d885717 |
| ("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> |
| Signed-off-by: Antonio Quartulli <antonio@meshcoding.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/batman-adv/bat_iv_ogm.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/net/batman-adv/bat_iv_ogm.c |
| +++ b/net/batman-adv/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) |
