1 files changed, 50 insertions, 26 deletions

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 5ee1a3682bf2..826cd5221536 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -11,6 +11,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -20,27 +21,32 @@
 /* Bridge group multicast address 802.1d (pg 51). */
 const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
-static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
+static int br_pass_frame_up(struct sk_buff *skb)
 {
-        struct net_device *indev, *brdev = br->dev;
+        struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
+        struct net_bridge *br = netdev_priv(brdev);
+        struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats);
 
-        brdev->stats.rx_packets++;
-        brdev->stats.rx_bytes += skb->len;
+        u64_stats_update_begin(&brstats->syncp);
+        brstats->rx_packets++;
+        brstats->rx_bytes += skb->len;
+        u64_stats_update_end(&brstats->syncp);
 
         indev = skb->dev;
         skb->dev = brdev;
 
-        NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
-                netif_receive_skb);
+        return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+                       netif_receive_skb);
 }
 
-/* note: already called with rcu_read_lock (preempt_disabled) */
+/* note: already called with rcu_read_lock */
 int br_handle_frame_finish(struct sk_buff *skb)
 {
         const unsigned char *dest = eth_hdr(skb)->h_dest;
-        struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
+        struct net_bridge_port *p = br_port_get_rcu(skb->dev);
         struct net_bridge *br;
         struct net_bridge_fdb_entry *dst;
+        struct net_bridge_mdb_entry *mdst;
         struct sk_buff *skb2;
 
         if (!p || p->state == BR_STATE_DISABLED)
@@ -50,9 +56,15 @@ int br_handle_frame_finish(struct sk_buff *skb)
         br = p->br;
         br_fdb_update(br, p, eth_hdr(skb)->h_source);
 
+        if (is_multicast_ether_addr(dest) &&
+            br_multicast_rcv(br, p, skb))
+                goto drop;
+
         if (p->state == BR_STATE_LEARNING)
                 goto drop;
 
+        BR_INPUT_SKB_CB(skb)->brdev = br->dev;
+
         /* The packet skb2 goes to the local host (NULL to skip). */
         skb2 = NULL;
 
@@ -62,27 +74,35 @@ int br_handle_frame_finish(struct sk_buff *skb)
         dst = NULL;
 
         if (is_multicast_ether_addr(dest)) {
+                mdst = br_mdb_get(br, skb);
+                if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+                        if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
+                            br_multicast_is_router(br))
+                                skb2 = skb;
+                        br_multicast_forward(mdst, skb, skb2);
+                        skb = NULL;
+                        if (!skb2)
+                                goto out;
+                } else
+                        skb2 = skb;
+
                 br->dev->stats.multicast++;
-                skb2 = skb;
         } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
                 skb2 = skb;
                 /* Do not forward the packet since it's local. */
                 skb = NULL;
         }
 
-        if (skb2 == skb)
-                skb2 = skb_clone(skb, GFP_ATOMIC);
-
-        if (skb2)
-                br_pass_frame_up(br, skb2);
-
         if (skb) {
                 if (dst)
-                        br_forward(dst->dst, skb);
+                        br_forward(dst->dst, skb, skb2);
                 else
-                        br_flood_forward(br, skb);
+                        br_flood_forward(br, skb, skb2);
         }
 
+        if (skb2)
+                return br_pass_frame_up(skb2);
+
 out:
         return 0;
 drop:
@@ -90,13 +110,12 @@ drop:
         goto out;
 }
 
-/* note: already called with rcu_read_lock (preempt_disabled) */
+/* note: already called with rcu_read_lock */
 static int br_handle_local_finish(struct sk_buff *skb)
 {
-        struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
+        struct net_bridge_port *p = br_port_get_rcu(skb->dev);
 
-        if (p)
-                br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
+        br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
         return 0;        /* process further */
 }
 
@@ -113,15 +132,18 @@ static inline int is_link_local(const unsigned char *dest)
 }
 
 /*
- * Called via br_handle_frame_hook.
  * Return NULL if skb is handled
- * note: already called with rcu_read_lock (preempt_disabled)
+ * note: already called with rcu_read_lock
  */
-struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
+struct sk_buff *br_handle_frame(struct sk_buff *skb)
 {
+        struct net_bridge_port *p;
         const unsigned char *dest = eth_hdr(skb)->h_dest;
         int (*rhook)(struct sk_buff *skb);
 
+        if (skb->pkt_type == PACKET_LOOPBACK)
+                return skb;
+
         if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                 goto drop;
 
@@ -129,6 +151,8 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
         if (!skb)
                 return NULL;
 
+        p = br_port_get_rcu(skb->dev);
+
         if (unlikely(is_link_local(dest))) {
                 /* Pause frames shouldn't be passed up by driver anyway */
                 if (skb->protocol == htons(ETH_P_PAUSE))
@@ -138,7 +162,7 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
                 if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)
                         goto forward;
 
-                if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+                if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
                             NULL, br_handle_local_finish))
                         return NULL;    /* frame consumed by filter */
                 else
@@ -159,7 +183,7 @@ forward:
                 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,
+                NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
                         br_handle_frame_finish);
                 break;
         default: