[linux-next] LinuxNextTracking branch, master, updated. next-20140219

batman at open-mesh.org batman at open-mesh.org
Thu Feb 20 00:22:57 CET 2014

The following commit has been merged in the master branch:
commit 05c3c8a636aa9ee35ce13f65afc5b665615cc786
Author: Antonio Quartulli <antonio at open-mesh.com>
Date:   Tue Feb 11 17:05:07 2014 +0100

    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 at personaltelco.net>
    Signed-off-by: Antonio Quartulli <antonio at open-mesh.com>
    Tested-by: Russell Senior <russell at personaltelco.net>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index c26f073..a953d5b 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;


More information about the linux-merge mailing list