summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSimon Wunderlich <simon@open-mesh.com>2014-03-26 15:46:21 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-31 13:20:37 -0700
commit1adf643050df1289c36dd158baa5d4cc2fa593ae (patch)
tree8a2d263be9abfe5f22a4afd1fc9233a66fa8ea9b /net
parentc712c1f79c8e074cb4568231c3b034519896108d (diff)
downloadlinux-stable-1adf643050df1289c36dd158baa5d4cc2fa593ae.tar.gz
linux-stable-1adf643050df1289c36dd158baa5d4cc2fa593ae.tar.bz2
linux-stable-1adf643050df1289c36dd158baa5d4cc2fa593ae.zip
batman-adv: fix neigh_ifinfo imbalance
[ 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>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/bat_iv_ogm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 8323bced8e5b..d074d06ce094 100644
--- 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)