]> git.baikalelectronics.ru Git - kernel.git/commitdiff
batman-adv: fix memory leak when dropping packet from other gateway
authorAndreas Pape <apape@phoenixcontact.com>
Fri, 19 May 2017 08:01:42 +0000 (10:01 +0200)
committerSimon Wunderlich <sw@simonwunderlich.de>
Fri, 19 May 2017 10:20:28 +0000 (12:20 +0200)
The skb must be released in the receive handler since 4d4bc9bb3e60
("batman-adv: Consume skb in receive handlers"). Just returning NET_RX_DROP
will no longer automatically free the memory. This results in memory leaks
when unicast packets from other backbones must be dropped because they
share a common backbone.

Fixes: 15fdc2bbf9a8 ("batman-adv: drop unicast packets from other backbone gw")
Signed-off-by: Andreas Pape <apape@phoenixcontact.com>
[sven@narfation.org: adjust commit message]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
net/batman-adv/routing.c

index e1ebe14ee2a6e21cc8d6b4a42552cae4bd15061f..ae9f4d37d34f07182c3d2527186a0999fe5b639d 100644 (file)
@@ -987,7 +987,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
                                batadv_dbg(BATADV_DBG_BLA, bat_priv,
                                           "recv_unicast_packet(): Dropped unicast pkt received from another backbone gw %pM.\n",
                                           orig_addr_gw);
-                               return NET_RX_DROP;
+                               goto free_skb;
                        }
                }