From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org,
pabeni@redhat.com, edumazet@google.com
Subject: [PATCH net 6/7] netfilter: nf_tables: memleak flow rule from commit path
Date: Mon, 6 Jun 2022 23:20:54 +0200 [thread overview]
Message-ID: <20220606212055.98300-7-pablo@netfilter.org> (raw)
In-Reply-To: <20220606212055.98300-1-pablo@netfilter.org>
Abort path release flow rule object, however, commit path does not.
Update code to destroy these objects before releasing the transaction.
Fixes: c9626a2cbdb2 ("netfilter: nf_tables: add hardware offload support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_tables_api.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 252796a99f5e..1a6a21bfb18d 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8329,6 +8329,9 @@ static void nft_commit_release(struct nft_trans *trans)
nf_tables_chain_destroy(&trans->ctx);
break;
case NFT_MSG_DELRULE:
+ if (trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD)
+ nft_flow_rule_destroy(nft_trans_flow_rule(trans));
+
nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans));
break;
case NFT_MSG_DELSET:
@@ -8817,6 +8820,9 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)
nf_tables_rule_notify(&trans->ctx,
nft_trans_rule(trans),
NFT_MSG_NEWRULE);
+ if (trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD)
+ nft_flow_rule_destroy(nft_trans_flow_rule(trans));
+
nft_trans_destroy(trans);
break;
case NFT_MSG_DELRULE:
--
2.30.2
next prev parent reply other threads:[~2022-06-06 21:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 21:20 [PATCH net 0/7] Netfilter fixes for net Pablo Neira Ayuso
2022-06-06 21:20 ` [PATCH net 1/7] netfilter: nat: really support inet nat without l3 address Pablo Neira Ayuso
2022-06-08 1:20 ` patchwork-bot+netdevbpf
2022-06-06 21:20 ` [PATCH net 2/7] netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path Pablo Neira Ayuso
2022-06-06 21:20 ` [PATCH net 3/7] netfilter: nf_tables: delete flowtable hooks via transaction list Pablo Neira Ayuso
2022-06-06 21:20 ` [PATCH net 4/7] netfilter: nf_tables: always initialize flowtable hook list in transaction Pablo Neira Ayuso
2022-06-06 21:20 ` [PATCH net 5/7] netfilter: nf_tables: release new hooks on unsupported flowtable flags Pablo Neira Ayuso
2022-06-06 21:20 ` Pablo Neira Ayuso [this message]
2022-06-06 21:20 ` [PATCH net 7/7] netfilter: nf_tables: bail out early if hardware offload is not supported Pablo Neira Ayuso
2022-06-08 1:00 ` Jakub Kicinski
2022-06-08 6:03 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220606212055.98300-7-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).