UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: conntrack: avoid excess memory allocation 

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: 23014011ba ("netfilter: conntrack: support a fixed size of 128 distinct labels")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2016-10-26 23:46:17 +02:00 committed by Pablo Neira Ayuso
parent f1d505bb76
commit cdb436d181
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/netfilter/nf_conntrack_labels.h
View File

@ -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) if (net->ct.labels_used == 0)
return NULL; return NULL;
return nf_ct_ext_add_length(ct, NF_CT_EXT_LABELS, return nf_ct_ext_add(ct, NF_CT_EXT_LABELS, GFP_ATOMIC);
sizeof(struct nf_conn_labels), GFP_ATOMIC);
#else #else
return NULL; return NULL;
#endif #endif