Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58e5aa7 authored by Joe Stringer's avatar Joe Stringer Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: Use flags in nf_ct_tmpl_alloc() 



The flags were ignored for this function when it was introduced. Also
fix the style problem in kzalloc.

Fixes: 0838aa7f (netfilter: fix netns dependencies with conntrack
templates)
Signed-off-by: default avatarJoe Stringer <joestringer@nicira.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1a727c63

net/netfilter/nf_conntrack_core.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags) 
{

	struct nf_conn *tmpl;



	tmpl = kzalloc(sizeof(struct nf_conn), GFP_KERNEL);

	tmpl = kzalloc(sizeof(*tmpl), flags);

	if (tmpl == NULL)

		return NULL;
@@ -303,7 +303,7 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags) 
	if (zone) {

		struct nf_conntrack_zone *nf_ct_zone;



		nf_ct_zone = nf_ct_ext_add(tmpl, NF_CT_EXT_ZONE, GFP_ATOMIC);

		nf_ct_zone = nf_ct_ext_add(tmpl, NF_CT_EXT_ZONE, flags);

		if (!nf_ct_zone)

			goto out_free;

		nf_ct_zone->id = zone;