[PATCH nf] netfilter: conntrack: avoid excess memory allocation

[PATCH nf] netfilter: conntrack: avoid excess memory allocation

[Florian Westphal]

This is now a fixed-size extension, so we don't need to pass a variable
alloc size.  This (harmless) error results in allocating 32 instead of
the needed 16 bytes for this extension as the size gets passed twice.

Fixes: 23014011ba420 ("netfilter: conntrack: support a fixed size of 128 distinct labels")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
diff --git a/include/net/netfilter/nf_conntrack_labels.h b/include/net/netfilter/nf_conntrack_labels.h
index 498814626e28..1723a67c0b0a 100644
--- a/include/net/netfilter/nf_conntrack_labels.h
+++ b/include/net/netfilter/nf_conntrack_labels.h
@@ -30,8 +30,7 @@ static inline struct nf_conn_labels *nf_ct_labels_ext_add(struct nf_conn *ct)
 	if (net->ct.labels_used == 0)
 		return NULL;
 
-	return nf_ct_ext_add_length(ct, NF_CT_EXT_LABELS,
-				    sizeof(struct nf_conn_labels), GFP_ATOMIC);
+	return nf_ct_ext_add(ct, NF_CT_EXT_LABELS, GFP_ATOMIC);
 #else
 	return NULL;
 #endif
-- 
2.7.3

Re: [PATCH nf] netfilter: conntrack: avoid excess memory allocation

[Pablo Neira Ayuso]

On Wed, Oct 26, 2016 at 11:46:17PM +0200, Florian Westphal wrote:
> This is now a fixed-size extension, so we don't need to pass a variable
> alloc size.  This (harmless) error results in allocating 32 instead of
> the needed 16 bytes for this extension as the size gets passed twice.

Applied, thanks Florian.