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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 7 00:19:23 CET 2014


The following commit has been merged in the master branch:
commit 55883fd1048e09f5b6e1edaf0caf7e4f6f31f971
Author: Antonio Quartulli <antonio at 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 at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index b4881f8..875a702 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);
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list