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

Commit b891c5a8 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

netfilter: nf_conntrack: add allocation flag to nf_conntrack_alloc 



ctnetlink does not need to allocate the conntrack entries with GFP_ATOMIC
as its code is executed in user context.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b11c16be

include/net/netfilter/nf_conntrack.h

+2 −1
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ nf_ct_iterate_cleanup(int (*iter)(struct nf_conn *i, void *data), void *data); 
extern void nf_conntrack_free(struct nf_conn *ct);

extern struct nf_conn *

nf_conntrack_alloc(const struct nf_conntrack_tuple *orig,

		   const struct nf_conntrack_tuple *repl);

		   const struct nf_conntrack_tuple *repl,

		   gfp_t gfp);



/* It's confirmed if it is, or has been in the hash table. */

static inline int nf_ct_is_confirmed(struct nf_conn *ct)

net/netfilter/nf_conntrack_core.c

+4 −3
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ static noinline int early_drop(unsigned int hash) 
}



struct nf_conn *nf_conntrack_alloc(const struct nf_conntrack_tuple *orig,

				   const struct nf_conntrack_tuple *repl)

				   const struct nf_conntrack_tuple *repl,

				   gfp_t gfp)

{

	struct nf_conn *ct = NULL;
@@ -489,7 +490,7 @@ struct nf_conn *nf_conntrack_alloc(const struct nf_conntrack_tuple *orig, 
		}

	}



	ct = kmem_cache_zalloc(nf_conntrack_cachep, GFP_ATOMIC);

	ct = kmem_cache_zalloc(nf_conntrack_cachep, gfp);

	if (ct == NULL) {

		pr_debug("nf_conntrack_alloc: Can't alloc conntrack.\n");

		atomic_dec(&nf_conntrack_count);
@@ -542,7 +543,7 @@ init_conntrack(const struct nf_conntrack_tuple *tuple, 
		return NULL;

	}



	ct = nf_conntrack_alloc(tuple, &repl_tuple);

	ct = nf_conntrack_alloc(tuple, &repl_tuple, GFP_ATOMIC);

	if (ct == NULL || IS_ERR(ct)) {

		pr_debug("Can't allocate conntrack.\n");

		return (struct nf_conntrack_tuple_hash *)ct;

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[], 
	struct nf_conn_help *help;

	struct nf_conntrack_helper *helper;



	ct = nf_conntrack_alloc(otuple, rtuple);

	ct = nf_conntrack_alloc(otuple, rtuple, GFP_KERNEL);

	if (ct == NULL || IS_ERR(ct))

		return -ENOMEM;