summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAntonio Quartulli <antonio@open-mesh.com>2014-02-11 17:05:07 +0100
committerAntonio Quartulli <antonio@meshcoding.com>2014-02-17 17:17:02 +0100
commit05c3c8a636aa9ee35ce13f65afc5b665615cc786 (patch)
treefca2b8358133165a090d76f3f5c4872fbb75d2af /net
parenta30e22ca8464c2dc573e0144a972221c2f06c2cd (diff)
downloadlinux-stable-05c3c8a636aa9ee35ce13f65afc5b665615cc786.tar.gz
linux-stable-05c3c8a636aa9ee35ce13f65afc5b665615cc786.tar.bz2
linux-stable-05c3c8a636aa9ee35ce13f65afc5b665615cc786.zip
batman-adv: free skb on TVLV parsing success
When the TVLV parsing routine succeed the skb is left untouched thus leading to a memory leak. Fix this by consuming the skb in case of success. Introduced by ef26157747d42254453f6b3ac2bd8bd3c53339c3 ("batman-adv: tvlv - basic infrastructure") Reported-by: Russel Senior <russell@personaltelco.net> Signed-off-by: Antonio Quartulli <antonio@open-mesh.com> Tested-by: Russell Senior <russell@personaltelco.net> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/routing.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index c26f07368849..a953d5b196a3 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -918,6 +918,8 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,
if (ret != NET_RX_SUCCESS)
ret = batadv_route_unicast_packet(skb, recv_if);
+ else
+ consume_skb(skb);
return ret;
}