summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAntonio Quartulli <antonio@meshcoding.com>2013-12-23 01:28:05 +0100
committerAntonio Quartulli <antonio@meshcoding.com>2013-12-28 14:47:44 +0100
commit55883fd1048e09f5b6e1edaf0caf7e4f6f31f971 (patch)
treecccd25e8e8b265c3f2eeb2f28336c33aea8ec505 /net
parentca6630464454d74ae1d430e99007a1139f4a2aba (diff)
downloadlinux-55883fd1048e09f5b6e1edaf0caf7e4f6f31f971.tar.bz2
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>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/soft-interface.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index b4881f8e28e8..875a702542c2 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -346,6 +346,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);
+
vid = batadv_get_vid(skb, hdr_size);
ethhdr = eth_hdr(skb);