From: Changli Gao Date: Mon, 15 Nov 2010 10:47:52 +0000 (+0100) Subject: netfilter: ct_extend: fix the wrong alloc_size X-Git-Tag: MMI-PSA29.97-13-9~20520^2~510^2~38 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b2368806915e1e69ac3bcc0d6a7cfde64307655;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git netfilter: ct_extend: fix the wrong alloc_size In function update_alloc_size(), sizeof(struct nf_ct_ext) is added twice wrongly. Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy --- diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c index bd82450c193f..920f9244388b 100644 --- a/net/netfilter/nf_conntrack_extend.c +++ b/net/netfilter/nf_conntrack_extend.c @@ -144,9 +144,8 @@ static void update_alloc_size(struct nf_ct_ext_type *type) if (!t1) continue; - t1->alloc_size = sizeof(struct nf_ct_ext) - + ALIGN(sizeof(struct nf_ct_ext), t1->align) - + t1->len; + t1->alloc_size = ALIGN(sizeof(struct nf_ct_ext), t1->align) + + t1->len; for (j = 0; j < NF_CT_EXT_NUM; j++) { t2 = nf_ct_ext_types[j]; if (t2 == NULL || t2 == t1 ||