aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-06-22 14:16:45 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-30 14:40:25 -0700
commitec2ba592c29c77b841cd1b8ca19aefed21fbb6fe (patch)
tree166df21c53ca28db17836cf050716fd83a262207
parentf50eb3cf5d793006902a40217f52eeb7f498104f (diff)
downloadlinux-linaro-stable-ec2ba592c29c77b841cd1b8ca19aefed21fbb6fe.tar.gz
netfilter: xt_quota: fix incomplete initialization
commit 6d62182fea6cc6bbc8d82a691ad0608d68a54aeb upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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;
}