1 files changed, 7 insertions, 8 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 13f34acb2a8e..c3b77dceb937 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -13,6 +13,7 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 #include <linux/netpoll.h>
 #include <linux/ethtool.h>
 #include <linux/if_arp.h>
@@ -322,7 +323,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 
         /* Don't allow bridging non-ethernet like devices */
         if ((dev->flags & IFF_LOOPBACK) ||
-            dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN)
+            dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN ||
+            !is_valid_ether_addr(dev->dev_addr))
                 return -EINVAL;
 
         /* No bridging of bridges */
@@ -350,10 +352,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
                                    SYSFS_BRIDGE_PORT_ATTR);
         if (err)
-                goto err0;
-
-        err = br_fdb_insert(br, p, dev->dev_addr);
-        if (err)
                 goto err1;
 
         err = br_sysfs_addif(p);
@@ -394,6 +392,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 
         dev_set_mtu(br->dev, br_min_mtu(br));
 
+        if (br_fdb_insert(br, p, dev->dev_addr))
+                netdev_err(dev, "failed insert local address bridge forwarding table\n");
+
         kobject_uevent(&p->kobj, KOBJ_ADD);
 
         return 0;
@@ -403,11 +404,9 @@ err4:
 err3:
         sysfs_remove_link(br->ifobj, p->dev->name);
 err2:
-        br_fdb_delete_by_port(br, p, 1);
-err1:
         kobject_put(&p->kobj);
         p = NULL; /* kobject_put frees */
-err0:
+err1:
         dev_set_promiscuity(dev, -1);
 put_back:
         dev_put(dev);