The netfilter hook seems to be misused and may leak skbs in situations when NF_HOOK returns NF_STOLEN. It doesn't filter in the right chain and may not filter everything as expected.
It was only added for testing purposes and can be removed again. Reported-by: Vasiliy Kulikov <[email protected]> Signed-off-by: Sven Eckelmann <[email protected]> --- batman-adv/hard-interface.c | 13 ------------- batman-adv/send.c | 8 ++------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index f481cbb..d53138c 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -30,7 +30,6 @@ #include "hash.h" #include <linux/if_arp.h> -#include <linux/netfilter_bridge.h> #include "compat.h" @@ -495,11 +494,6 @@ out: return NOTIFY_DONE; } -static int batman_skb_recv_finish(struct sk_buff *skb) -{ - return NF_ACCEPT; -} - /* receive a packet with the batman ethertype coming on a hard * interface */ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, @@ -517,13 +511,6 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, if (!skb) goto err_out; - /* if netfilter/ebtables wants to block incoming batman - * packets then give them a chance to do so here */ - ret = NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, dev, NULL, - batman_skb_recv_finish); - if (ret != 1) - goto err_out; - /* packet should hold at least type and version */ if (unlikely(!pskb_may_pull(skb, 2))) goto err_free; diff --git a/batman-adv/send.c b/batman-adv/send.c index 47bde44..97c3142 100644 --- a/batman-adv/send.c +++ b/batman-adv/send.c @@ -29,7 +29,6 @@ #include "vis.h" #include "aggregation.h" #include "gateway_common.h" -#include <linux/netfilter_bridge.h> #include "compat.h" @@ -94,12 +93,9 @@ int send_skb_packet(struct sk_buff *skb, /* dev_queue_xmit() returns a negative result on error. However on * congestion and traffic shaping, it drops and returns NET_XMIT_DROP - * (which is > 0). This will not be treated as an error. - * Also, if netfilter/ebtables wants to block outgoing batman - * packets then giving them a chance to do so here */ + * (which is > 0). This will not be treated as an error. */ - return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, - dev_queue_xmit); + return dev_queue_xmit(skb); send_skb_err: kfree_skb(skb); return NET_XMIT_DROP; -- 1.7.1
