netfilter: nf_tables: fix flowtable free
Subsystems (3)
PATCH 1/2 netfilter: nf_tables: fix flowtable free
Every flow_offload entry is added into the table twice. Because of this, rhashtable_free_and_destroy can't be used, since it would call kfree for each flow_offload object twice.
Signed-off-by Felix Fietkau <[email protected]>
--- include/net/netfilter/nf_flow_table.h | 2 ++ net/ipv4/netfilter/nf_flow_table_ipv4.c | 1 + net/ipv6/netfilter/nf_flow_table_ipv6.c | 1 + net/netfilter/nf_flow_table.c | 15 +++++++++++++++ net/netfilter/nf_flow_table_inet.c | 1 + net/netfilter/nf_tables_api.c | 8 +------- 6 files changed, 21 insertions(+), 7 deletions(-)
include/net/netfilter/nf_flow_table.h +2 -0
@@ -14,6 +14,7 @@ struct nf_flowtable_type {struct list_head list;int family;void (*gc)(struct work_struct *work); +void (*free)(struct nf_flowtable *table);const struct rhashtable_params *params;nf_hookfn *hook;struct module *owner;
@@ -95,6 +96,7 @@ struct flow_offload_tuple_rhash *flow_offload_lookup(struct nf_flowtable *flow_tint nf_flow_table_iterate (struct nf_flowtable *flow_table,void (*iter)(struct flow_offload *flow,void *data),void *data); +void nf_flow_table_free (struct nf_flowtable *flow_table);void nf_flow_offload_work_gc (struct work_struct *work);extern const struct rhashtable_params nf_flow_offload_rhash_params;
net/ipv4/netfilter/nf_flow_table_ipv4.c +1 -0
@@ -260,6 +260,7 @@ static struct nf_flowtable_type flowtable_ipv4 = { .family = NFPROTO_IPV4, .params = &nf_flow_offload_rhash_params, .gc = nf_flow_offload_work_gc, + .free = nf_flow_table_free, .hook = nf_flow_offload_ip_hook, .owner = THIS_MODULE, };
net/ipv6/netfilter/nf_flow_table_ipv6.c +1 -0
@@ -253,6 +253,7 @@ static struct nf_flowtable_type flowtable_ipv6 = { .family = NFPROTO_IPV6, .params = &nf_flow_offload_rhash_params, .gc = nf_flow_offload_work_gc, + .free = nf_flow_table_free, .hook = nf_flow_offload_ipv6_hook, .owner = THIS_MODULE, };
net/netfilter/nf_flow_table.c +15 -0
@@ -221,6 +221,21 @@ int nf_flow_table_iterate(struct nf_flowtable *flow_table, }EXPORT_SYMBOL_GPL (nf_flow_table_iterate); +static void +__nf_flow_offload_free (struct flow_offload *flow,void *data) +{ +struct nf_flowtable *flow_table = data; + +flow_offload_del (flow_table, flow); +} + +void nf_flow_table_free (struct nf_flowtable *flow_table) +{ +nf_flow_table_iterate (flow_table, __nf_flow_offload_free, flow_table); +rhashtable_destroy (&flow_table->rhashtable); +} +EXPORT_SYMBOL_GPL (nf_flow_table_free); +static inline bool nf_flow_has_expired (const struct flow_offload *flow) {return (__s32)(flow->timeout - (u32 )jiffies) <=0 ;
net/netfilter/nf_flow_table_inet.c +1 -0
@@ -24,6 +24,7 @@ static struct nf_flowtable_type flowtable_inet = { .family = NFPROTO_INET, .params = &nf_flow_offload_rhash_params, .gc = nf_flow_offload_work_gc, + .free = nf_flow_table_free, .hook = nf_flow_offload_inet_hook, .owner = THIS_MODULE, };
net/netfilter/nf_tables_api.c +1 -7
@@ -5399,17 +5399,11 @@ static void nf_tables_flowtable_notify(struct nft_ctx *ctx,nfnetlink_set_err (ctx->net, ctx->portid,NFNLGRP_NFTABLES , -ENOBUFS ); } -static void nft_flowtable_destroy (void *ptr,void *arg) -{ -kfree (ptr); -} -static void nf_tables_flowtable_destroy (struct nft_flowtable *flowtable) {cancel_delayed_work_sync (&flowtable->data.gc_work);kfree (flowtable->name); -rhashtable_free_and_destroy (&flowtable->data.rhashtable, - nft_flowtable_destroy,NULL ); + flowtable->data.type->free (&flowtable->data);module_put (flowtable->data.type->owner); }
Signature · 1 line
2.14.2
PATCH 2/2 netfilter: nf_tables: fix flowtable resource leak
When cleaning up flowtable entries, associated dst and ct entries need to be released as well
Signed-off-by Felix Fietkau <[email protected]>
--- net/netfilter/nf_flow_table.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
net/netfilter/nf_flow_table.c +5 -14
@@ -124,7 +124,7 @@ void flow_offload_free(struct flow_offload *flow)dst_release (flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].tuple.dst_cache);dst_release (flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple.dst_cache); e = container_of(flow, struct flow_offload_entry, flow); -kfree (e); +kfree_rcu (e, rcu_head); }EXPORT_SYMBOL_GPL (flow_offload_free);
@@ -161,7 +161,9 @@ void flow_offload_del(struct nf_flowtable *flow_table, *flow_table->type->params); e = container_of(flow, struct flow_offload_entry, flow); -kfree_rcu (e, rcu_head); +nf_ct_delete (e->ct,0 ,0 ); +nf_ct_put (e->ct); +flow_offload_free (flow); }EXPORT_SYMBOL_GPL (flow_offload_del);
@@ -174,15 +176,6 @@ flow_offload_lookup(struct nf_flowtable *flow_table, }EXPORT_SYMBOL_GPL (flow_offload_lookup); -static void nf_flow_release_ct (const struct flow_offload *flow) -{ -struct flow_offload_entry *e; - - e = container_of(flow, struct flow_offload_entry, flow); -nf_ct_delete (e->ct,0 ,0 ); -nf_ct_put (e->ct); -} -int nf_flow_table_iterate (struct nf_flowtable *flow_table,void (*iter)(struct flow_offload *flow,void *data),void *data)
@@ -276,10 +269,8 @@ void nf_flow_offload_work_gc(struct work_struct *work) flow = container_of(tuplehash, struct flow_offload, tuplehash[0]);if (nf_flow_has_expired (flow) || -nf_flow_is_dying (flow)) { +nf_flow_is_dying (flow))flow_offload_del (flow_table, flow); -nf_flow_release_ct (flow); - } } out:rhashtable_walk_stop (&hti);
Signature · 1 line
2.14.2