2015-08-05 01:34:15

by Joe Stringer

Subject: [PATCH net] 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: 0838aa7fc (netfilter: fix netns dependencies with conntrack
templates)
Signed-off-by: Joe Stringer <[email protected]>
---
net/netfilter/nf_conntrack_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f168099..3c20d02 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -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;
--
2.1.4

2015-08-05 01:38:22

by Joe Stringer

Subject: Re: [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()

On 4 August 2015 at 18:34, Joe Stringer <[email protected]> wrote:
> The flags were ignored for this function when it was introduced. Also
> fix the style problem in kzalloc.
>
> Fixes: 0838aa7fc (netfilter: fix netns dependencies with conntrack
> templates)
> Signed-off-by: Joe Stringer <[email protected]>

s/net/nf/ in subject line.

2015-08-05 08:49:11

by Pablo Neira Ayuso

Subject: Re: [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()

On Tue, Aug 04, 2015 at 06:34:00PM -0700, Joe Stringer wrote:
> The flags were ignored for this function when it was introduced. Also
> fix the style problem in kzalloc.

Applied, thanks Joe.