diff mbox

netfilter -stable 05/08: xt_quota: fix incomplete initialization

Message ID 20090723141530.19029.8546.sendpatchset@x2.localnet
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Patrick McHardy July 23, 2009, 2:15 p.m. UTC 
commit 60cc46b2f32e6829efa4067914da11e4d64f421a
Author: Patrick McHardy <kaber@trash.net>
Date:   Fri Jul 3 10:35:12 2009 +0200

    netfilter: xt_quota: fix incomplete initialization
    
    Upstream commit 6d62182f:
    
    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>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index 01dd07b..98fc190 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;
 }