aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-27 13:16:14 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-27 13:16:14 -0400
commit392b408782324e62709f080a84de2866f7b125d4 (patch)
treed6456eb38979a4fa3b5341cb9408ccb8e166da1d
parent5e19997a742c7c8203be628a7a69babc3bcf01a4 (diff)
parent82e6bfe2fbc4d48852114c4f979137cd5bf1d1a8 (diff)
downloadlinux-yocto-4.8-392b408782324e62709f080a84de2866f7b125d4.tar.gz
linux-yocto-4.8-392b408782324e62709f080a84de2866f7b125d4.tar.bz2
linux-yocto-4.8-392b408782324e62709f080a84de2866f7b125d4.zip
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says: ==================== If time allows, I'd appreciate if you can take the following fix for the xt_limit match. As Jan indicates, random things may occur while using the xt_limit match due to use of uninitialized memory. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netfilter/xt_limit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index 5c22ce8ab309..a4c1e4528cac 100644
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -117,11 +117,11 @@ static int limit_mt_check(const struct xt_mtchk_param *par)
/* For SMP, we only want to use one set of state. */
r->master = priv;
+ /* User avg in seconds * XT_LIMIT_SCALE: convert to jiffies *
+ 128. */
+ priv->prev = jiffies;
+ priv->credit = user2credits(r->avg * r->burst); /* Credits full. */
if (r->cost == 0) {
- /* User avg in seconds * XT_LIMIT_SCALE: convert to jiffies *
- 128. */
- priv->prev = jiffies;
- priv->credit = user2credits(r->avg * r->burst); /* Credits full. */
r->credit_cap = priv->credit; /* Credits full. */
r->cost = user2credits(r->avg);
}