Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit 135602880b28bc7cf12c60fec550a6122851f2e9 Author: Antonio Quartulli antonio@meshcoding.com Date: Mon Dec 23 01:28:05 2013 +0100

batman-adv: clean nf state when removing protocol header

If an interface enslaved into batman-adv is a bridge (or a virtual interface built on top of a bridge) the nf_bridge member of the skbs reaching the soft-interface is filled with the state about "netfilter bridge" operations.

Then, if one of such skbs is locally delivered, the nf_bridge member should be cleaned up to avoid that the old state could mess up with other "netfilter bridge" operations when entering a second bridge. This is needed because batman-adv is an encapsulation protocol.

However at the moment skb->nf_bridge is not released at all leading to bogus "netfilter bridge" behaviours.

Fix this by cleaning the netfilter state of the skb before it gets delivered to the upper layer in interface_rx().

Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

135602880b28bc7cf12c60fec550a6122851f2e9 soft-interface.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/soft-interface.c b/soft-interface.c index 33b6144..08086cf 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -324,6 +324,11 @@ void batadv_interface_rx(struct net_device *soft_iface, skb_pull_rcsum(skb, hdr_size); skb_reset_mac_header(skb);

+ /* clean the netfilter state now that the batman-adv header has been + * removed + */ + nf_reset(skb); + ethhdr = eth_hdr(skb);

switch (ntohs(ethhdr->h_proto)) {