summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-06-22 14:16:45 +0200
committerPatrick McHardy <kaber@trash.net>2009-06-22 14:16:45 +0200
commit6d62182fea6cc6bbc8d82a691ad0608d68a54aeb (patch)
treeeefff92d2a4c7fc6751485eacd21e620dd7ac925 /net
parentnetfilter: nf_log: fix direct userspace memory access in proc handler (diff)
downloadlinux-6d62182fea6cc6bbc8d82a691ad0608d68a54aeb.tar.xz
linux-6d62182fea6cc6bbc8d82a691ad0608d68a54aeb.zip
netfilter: xt_quota: fix incomplete initialization
Commit v2.6.29-rc5-872-gacc738f ("xtables: avoid pointer to self") forgot to copy the initial quota value supplied by iptables into the private structure, thus counting from whatever was in the memory kmalloc returned. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/xt_quota.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index 01dd07b764ec..98fc190e8f0e 100644
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -54,6 +54,7 @@ static bool quota_mt_check(const struct xt_mtchk_param *par)
if (q->master == NULL)
return -ENOMEM;
+ q->master->quota = q->quota;
return true;
}