Merge commit 'v2.6.30-rc5' into next

[karo-tx-linux.git] / net / netfilter / xt_limit.c

diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index c908d69a559585963108890d910946e1fb634fe4..2e8089ecd0af31b4ac17cf310a65ee5db97b6e0e 100644 (file)
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -14,6 +14,11 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_limit.h>
 
+struct xt_limit_priv {
+       unsigned long prev;
+       uint32_t credit;
+};
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Herve Eychenne <rv@wallfire.org>");
 MODULE_DESCRIPTION("Xtables: rate-limit match");
@@ -60,18 +65,18 @@ static DEFINE_SPINLOCK(limit_lock);
 static bool
 limit_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       struct xt_rateinfo *r =
-               ((const struct xt_rateinfo *)par->matchinfo)->master;
+       const struct xt_rateinfo *r = par->matchinfo;
+       struct xt_limit_priv *priv = r->master;
        unsigned long now = jiffies;
 
        spin_lock_bh(&limit_lock);
-       r->credit += (now - xchg(&r->prev, now)) * CREDITS_PER_JIFFY;
-       if (r->credit > r->credit_cap)
-               r->credit = r->credit_cap;
+       priv->credit += (now - xchg(&priv->prev, now)) * CREDITS_PER_JIFFY;
+       if (priv->credit > r->credit_cap)
+               priv->credit = r->credit_cap;
 
-       if (r->credit >= r->cost) {
+       if (priv->credit >= r->cost) {
                /* We're not limited. */
-               r->credit -= r->cost;
+               priv->credit -= r->cost;
                spin_unlock_bh(&limit_lock);
                return true;
        }
@@ -95,6 +100,7 @@ user2credits(u_int32_t user)
 static bool limit_mt_check(const struct xt_mtchk_param *par)
 {
        struct xt_rateinfo *r = par->matchinfo;
+       struct xt_limit_priv *priv;
 
        /* Check for overflow. */
        if (r->burst == 0
@@ -104,19 +110,30 @@ static bool limit_mt_check(const struct xt_mtchk_param *par)
                return false;
        }
 
-       /* For SMP, we only want to use one set of counters. */
-       r->master = r;
+       priv = kmalloc(sizeof(*priv), GFP_KERNEL);
+       if (priv == NULL)
+               return -ENOMEM;
+
+       /* For SMP, we only want to use one set of state. */
+       r->master = priv;
        if (r->cost == 0) {
                /* User avg in seconds * XT_LIMIT_SCALE: convert to jiffies *
                   128. */
-               r->prev = jiffies;
-               r->credit = user2credits(r->avg * r->burst);     /* Credits full. */
+               priv->prev = jiffies;
+               priv->credit = user2credits(r->avg * r->burst); /* Credits full. */
                r->credit_cap = user2credits(r->avg * r->burst); /* Credits full. */
                r->cost = user2credits(r->avg);
        }
        return true;
 }
 
+static void limit_mt_destroy(const struct xt_mtdtor_param *par)
+{
+       const struct xt_rateinfo *info = par->matchinfo;
+
+       kfree(info->master);
+}
+
 #ifdef CONFIG_COMPAT
 struct compat_xt_rateinfo {
        u_int32_t avg;
@@ -167,6 +184,7 @@ static struct xt_match limit_mt_reg __read_mostly = {
        .family           = NFPROTO_UNSPEC,
        .match            = limit_mt,
        .checkentry       = limit_mt_check,
+       .destroy          = limit_mt_destroy,
        .matchsize        = sizeof(struct xt_rateinfo),
 #ifdef CONFIG_COMPAT
        .compatsize       = sizeof(struct compat_xt_rateinfo),