[BRIDGE]: netfilter inline cleanup

[safe/jmp/linux-2.6] / net / bridge / br_input.c

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 2b1cce4..6e22372 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -21,16 +21,6 @@
 
 const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
-static int br_pass_frame_up_finish(struct sk_buff *skb)
-{
-#ifdef CONFIG_NETFILTER_DEBUG
-       skb->nf_debug = 0;
-#endif
-       netif_rx(skb);
-
-       return 0;
-}
-
 static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
 {
        struct net_device *indev;
@@ -42,18 +32,28 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
        skb->dev = br->dev;
 
        NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
-                       br_pass_frame_up_finish);
+               netif_receive_skb);
 }
 
 /* note: already called with rcu_read_lock (preempt_disabled) */
 int br_handle_frame_finish(struct sk_buff *skb)
 {
        const unsigned char *dest = eth_hdr(skb)->h_dest;
-       struct net_bridge_port *p = skb->dev->br_port;
-       struct net_bridge *br = p->br;
+       struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
+       struct net_bridge *br;
        struct net_bridge_fdb_entry *dst;
        int passedup = 0;
 
+       if (!p || p->state == BR_STATE_DISABLED)
+               goto drop;
+
+       /* insert into forwarding database after filtering to avoid spoofing */
+       br = p->br;
+       br_fdb_update(br, p, eth_hdr(skb)->h_source);
+
+       if (p->state == BR_STATE_LEARNING)
+               goto drop;
+
        if (br->dev->flags & IFF_PROMISC) {
                struct sk_buff *skb2;
 
@@ -64,7 +64,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
                }
        }
 
-       if (dest[0] & 1) {
+       if (is_multicast_ether_addr(dest)) {
                br_flood_forward(br, skb, !passedup);
                if (!passedup)
                        br_pass_frame_up(br, skb);
@@ -89,6 +89,9 @@ int br_handle_frame_finish(struct sk_buff *skb)
 
 out:
        return 0;
+drop:
+       kfree_skb(skb);
+       goto out;
 }
 
 /*
@@ -108,10 +111,6 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
        if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                goto err;
 
-       if (p->state == BR_STATE_LEARNING ||
-           p->state == BR_STATE_FORWARDING)
-               br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
        if (p->br->stp_enabled &&
            !memcmp(dest, bridge_ula, 5) &&
            !(dest[5] & 0xF0)) {
@@ -120,9 +119,10 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
                                NULL, br_stp_handle_bpdu);
                        return 1;
                }
+               goto err;
        }
 
-       else if (p->state == BR_STATE_FORWARDING) {
+       if (p->state == BR_STATE_FORWARDING || p->state == BR_STATE_LEARNING) {
                if (br_should_route_hook) {
                        if (br_should_route_hook(pskb)) 
                                return 0;
@@ -130,7 +130,7 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
                        dest = eth_hdr(skb)->h_dest;
                }
 
-               if (!memcmp(p->br->dev->dev_addr, dest, ETH_ALEN))
+               if (!compare_ether_addr(p->br->dev->dev_addr, dest))
                        skb->pkt_type = PACKET_HOST;
 
                NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,