Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / net / ipv4 / netfilter / ipt_hashlimit.c

diff --git a/net/ipv4/netfilter/ipt_hashlimit.c b/net/ipv4/netfilter/ipt_hashlimit.c
index f193719..7c6836c 100644 (file)
--- a/net/ipv4/netfilter/ipt_hashlimit.c
+++ b/net/ipv4/netfilter/ipt_hashlimit.c
@@ -37,10 +37,10 @@
 
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_hashlimit.h>
-#include <linux/netfilter_ipv4/lockhelp.h>
 
 /* FIXME: this is just for IP_NF_ASSERRT */
 #include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/mutex.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
@@ -92,10 +92,10 @@ struct ipt_hashlimit_htable {
        struct hlist_head hash[0];      /* hashtable itself */
 };
 
-static DECLARE_LOCK(hashlimit_lock);   /* protects htables list */
-static DECLARE_MUTEX(hlimit_mutex);    /* additional checkentry protection */
+static DEFINE_SPINLOCK(hashlimit_lock);        /* protects htables list */
+static DEFINE_MUTEX(hlimit_mutex);     /* additional checkentry protection */
 static HLIST_HEAD(hashlimit_htables);
-static kmem_cache_t *hashlimit_cachep;
+static kmem_cache_t *hashlimit_cachep __read_mostly;
 
 static inline int dst_cmp(const struct dsthash_ent *ent, struct dsthash_dst *b)
 {
@@ -233,9 +233,9 @@ static int htable_create(struct ipt_hashlimit_info *minfo)
        hinfo->timer.function = htable_gc;
        add_timer(&hinfo->timer);
 
-       LOCK_BH(&hashlimit_lock);
+       spin_lock_bh(&hashlimit_lock);
        hlist_add_head(&hinfo->node, &hashlimit_htables);
-       UNLOCK_BH(&hashlimit_lock);
+       spin_unlock_bh(&hashlimit_lock);
 
        return 0;
 }
@@ -301,15 +301,15 @@ static struct ipt_hashlimit_htable *htable_find_get(char *name)
        struct ipt_hashlimit_htable *hinfo;
        struct hlist_node *pos;
 
-       LOCK_BH(&hashlimit_lock);
+       spin_lock_bh(&hashlimit_lock);
        hlist_for_each_entry(hinfo, pos, &hashlimit_htables, node) {
                if (!strcmp(name, hinfo->pde->name)) {
                        atomic_inc(&hinfo->use);
-                       UNLOCK_BH(&hashlimit_lock);
+                       spin_unlock_bh(&hashlimit_lock);
                        return hinfo;
                }
        }
-       UNLOCK_BH(&hashlimit_lock);
+       spin_unlock_bh(&hashlimit_lock);
 
        return NULL;
 }
@@ -317,9 +317,9 @@ static struct ipt_hashlimit_htable *htable_find_get(char *name)
 static void htable_put(struct ipt_hashlimit_htable *hinfo)
 {
        if (atomic_dec_and_test(&hinfo->use)) {
-               LOCK_BH(&hashlimit_lock);
+               spin_lock_bh(&hashlimit_lock);
                hlist_del(&hinfo->node);
-               UNLOCK_BH(&hashlimit_lock);
+               spin_unlock_bh(&hashlimit_lock);
                htable_destroy(hinfo);
        }
 }
@@ -428,8 +428,10 @@ static int
 hashlimit_match(const struct sk_buff *skb,
                const struct net_device *in,
                const struct net_device *out,
+               const struct xt_match *match,
                const void *matchinfo,
                int offset,
+               unsigned int protoff,
                int *hotdrop)
 {
        struct ipt_hashlimit_info *r = 
@@ -505,16 +507,14 @@ hashlimit_match(const struct sk_buff *skb,
 
 static int
 hashlimit_checkentry(const char *tablename,
-                    const struct ipt_ip *ip,
+                    const void *inf,
+                    const struct xt_match *match,
                     void *matchinfo,
                     unsigned int matchsize,
                     unsigned int hook_mask)
 {
        struct ipt_hashlimit_info *r = matchinfo;
 
-       if (matchsize != IPT_ALIGN(sizeof(struct ipt_hashlimit_info)))
-               return 0;
-
        /* Check for overflow. */
        if (r->cfg.burst == 0
            || user2credits(r->cfg.avg * r->cfg.burst) < 
@@ -543,13 +543,13 @@ hashlimit_checkentry(const char *tablename,
         * call vmalloc, and that can sleep.  And we cannot just re-search
         * the list of htable's in htable_create(), since then we would
         * create duplicate proc files. -HW */
-       down(&hlimit_mutex);
+       mutex_lock(&hlimit_mutex);
        r->hinfo = htable_find_get(r->name);
        if (!r->hinfo && (htable_create(r) != 0)) {
-               up(&hlimit_mutex);
+               mutex_unlock(&hlimit_mutex);
                return 0;
        }
-       up(&hlimit_mutex);
+       mutex_unlock(&hlimit_mutex);
 
        /* Ugly hack: For SMP, we only want to use one set */
        r->u.master = r;
@@ -558,19 +558,21 @@ hashlimit_checkentry(const char *tablename,
 }
 
 static void
-hashlimit_destroy(void *matchinfo, unsigned int matchsize)
+hashlimit_destroy(const struct xt_match *match, void *matchinfo,
+                 unsigned int matchsize)
 {
        struct ipt_hashlimit_info *r = (struct ipt_hashlimit_info *) matchinfo;
 
        htable_put(r->hinfo);
 }
 
-static struct ipt_match ipt_hashlimit = { 
-       .name = "hashlimit", 
-       .match = hashlimit_match, 
-       .checkentry = hashlimit_checkentry, 
-       .destroy = hashlimit_destroy,
-       .me = THIS_MODULE 
+static struct ipt_match ipt_hashlimit = {
+       .name           = "hashlimit",
+       .match          = hashlimit_match,
+       .matchsize      = sizeof(struct ipt_hashlimit_info),
+       .checkentry     = hashlimit_checkentry,
+       .destroy        = hashlimit_destroy,
+       .me             = THIS_MODULE
 };
 
 /* PROC stuff */
@@ -717,15 +719,15 @@ cleanup_nothing:
        
 }
 
-static int __init init(void)
+static int __init ipt_hashlimit_init(void)
 {
        return init_or_fini(0);
 }
 
-static void __exit fini(void)
+static void __exit ipt_hashlimit_fini(void)
 {
        init_or_fini(1);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ipt_hashlimit_init);
+module_exit(ipt_hashlimit_fini);