3 files changed, 9 insertions, 3 deletions

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 601c37d61c..848b8fa8be 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -37,7 +37,9 @@ static int __init br_init(void)
                 return -EADDRINUSE;
         }
 
-        br_fdb_init();
+        err = br_fdb_init();
+        if (err)
+                goto err_out1;
 
         err = br_netfilter_init();
         if (err)
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 22645e3edf..91b017016d 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -31,13 +31,17 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
 
 static u32 fdb_salt __read_mostly;
 
-void __init br_fdb_init(void)
+int __init br_fdb_init(void)
 {
         br_fdb_cache = kmem_cache_create("bridge_fdb_cache",
                                          sizeof(struct net_bridge_fdb_entry),
                                          0,
                                          SLAB_HWCACHE_ALIGN, NULL, NULL);
+        if (!br_fdb_cache)
+                return -ENOMEM;
+
         get_random_bytes(&fdb_salt, sizeof(fdb_salt));
+        return 0;
 }
 
 void __exit br_fdb_fini(void)
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 974feccd28..21bf3a9a03 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -141,7 +141,7 @@ extern void br_dev_setup(struct net_device *dev);
 extern int br_dev_xmit(struct sk_buff *skb, struct net_device *dev);
 
 /* br_fdb.c */
-extern void br_fdb_init(void);
+extern int br_fdb_init(void);
 extern void br_fdb_fini(void);
 extern void br_fdb_flush(struct net_bridge *br);
 extern void br_fdb_changeaddr(struct net_bridge_port *p,