Merge branch 'linux-2.6'

4 files changed, 10 insertions, 7 deletions

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 93867bb6cc97..a90182873120 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -39,7 +39,7 @@ static int __init br_init(void)
 
         err = br_fdb_init();
         if (err)
-                goto err_out1;
+                goto err_out;
 
         err = br_netfilter_init();
         if (err)
@@ -65,6 +65,8 @@ err_out3:
 err_out2:
         br_netfilter_fini();
 err_out1:
+        br_fdb_fini();
+err_out:
         llc_sap_put(br_stp_sap);
         return err;
 }
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index eb57502bb264..bc40377136a2 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -44,7 +44,7 @@ int __init br_fdb_init(void)
         return 0;
 }
 
-void __exit br_fdb_fini(void)
+void br_fdb_fini(void)
 {
         kmem_cache_destroy(br_fdb_cache);
 }
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 3cedd4eeeed6..0ee79a726d91 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -122,6 +122,7 @@ static inline int is_link_local(const unsigned char *dest)
 struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 {
         const unsigned char *dest = eth_hdr(skb)->h_dest;
+        int (*rhook)(struct sk_buff *skb);
 
         if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                 goto drop;
@@ -147,9 +148,9 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 
         switch (p->state) {
         case BR_STATE_FORWARDING:
-
-                if (br_should_route_hook) {
-                        if (br_should_route_hook(skb))
+                rhook = rcu_dereference(br_should_route_hook);
+                if (rhook != NULL) {
+                        if (rhook(skb))
                                 return skb;
                         dest = eth_hdr(skb)->h_dest;
                 }
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index e44519ebf1d2..be6f18681053 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -70,13 +70,13 @@ static int __init ebtable_broute_init(void)
         if (ret < 0)
                 return ret;
         /* see br_input.c */
-        br_should_route_hook = ebt_broute;
+        rcu_assign_pointer(br_should_route_hook, ebt_broute);
         return ret;
 }
 
 static void __exit ebtable_broute_fini(void)
 {
-        br_should_route_hook = NULL;
+        rcu_assign_pointer(br_should_route_hook, NULL);
         synchronize_net();
         ebt_unregister_table(&broute_table);
 }