From: Simon Horman <simon.horman@corigine•com>
To: Pablo Neira Ayuso <pablo@netfilter•org>
Cc: netfilter-devel@vger•kernel.org, davem@davemloft•net,
netdev@vger•kernel.org, kuba@kernel•org, pabeni@redhat•com,
edumazet@google•com
Subject: Re: [PATCH net 02/14] netfilter: nf_tables: fix chain binding transaction logic
Date: Mon, 19 Jun 2023 21:58:42 +0200 [thread overview]
Message-ID: <ZJCzcufoMlCGE64U@corigine.com> (raw)
In-Reply-To: <20230619145805.303940-3-pablo@netfilter.org>
On Mon, Jun 19, 2023 at 04:57:53PM +0200, Pablo Neira Ayuso wrote:
> Add bound flag to rule and chain transactions as in 6a0a8d10a366
> ("netfilter: nf_tables: use-after-free in failing rule with bound set")
> to skip them in case that the chain is already bound from the abort
> path.
>
> This patch fixes an imbalance in the chain use refcnt that triggers a
> WARN_ON on the table and chain destroy path.
>
> This patch also disallows nested chain bindings, which is not
> supported from userspace.
>
> The logic to deal with chain binding in nft_data_hold() and
> nft_data_release() is not correct. The NFT_TRANS_PREPARE state needs a
> special handling in case a chain is bound but next expressions in the
> same rule fail to initialize as described by 1240eb93f061 ("netfilter:
> nf_tables: incorrect error path handling with NFT_MSG_NEWRULE").
>
> Fixes: d0e2c7de92c7 ("netfilter: nf_tables: add NFT_CHAIN_BINDING")
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter•org>
...
> diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
> index 69bceefaa5c8..7b3a0bf254e3 100644
> --- a/net/netfilter/nf_tables_api.c
> +++ b/net/netfilter/nf_tables_api.c
> @@ -193,6 +193,48 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)
> }
> }
>
> +static void nft_chain_trans_bind(const struct nft_ctx *ctx, struct nft_chain *chain)
> +{
> + struct nftables_pernet *nft_net;
> + struct net *net = ctx->net;
> + struct nft_trans *trans;
> +
> + if (!nft_chain_binding(chain))
> + return;
> +
> + nft_net = nft_pernet(net);
> + list_for_each_entry_reverse(trans, &nft_net->commit_list, list) {
> + switch (trans->msg_type) {
> + case NFT_MSG_NEWCHAIN:
> + if (nft_trans_chain(trans) == chain)
> + nft_trans_chain_bound(trans) = true;
> + break;
> + case NFT_MSG_NEWRULE:
> + if (trans->ctx.chain == chain)
> + nft_trans_rule_bound(trans) = bind;
Hi Pablo,
Maybe something got mixed up here somehow.
It seems that on x86_64 allmodconfig bind is not defined here.
gcc says:
net/netfilter/nf_tables_api.c: In function 'nft_chain_trans_bind':
net/netfilter/nf_tables_api.c:214:63: error: 'bind' undeclared (first use in this function)
214 | nft_trans_rule_bound(trans) = bind;
| ^~~~
net/netfilter/nf_tables_api.c:214:63: note: each undeclared identifier is reported only once for each function it appears in
> + break;
> + }
> + }
> +}
--
pw-bot: cr
next prev parent reply other threads:[~2023-06-19 19:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 14:57 [PATCH net 00/14] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 01/14] ipvs: align inner_mac_header for encapsulation Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 02/14] netfilter: nf_tables: fix chain binding transaction logic Pablo Neira Ayuso
2023-06-19 19:58 ` Simon Horman [this message]
2023-06-19 21:04 ` Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 03/14] netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 04/14] netfilter: nf_tables: drop map element references from preparation phase Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 05/14] netfilter: nft_set_pipapo: .walk does not deal with generations Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 06/14] netfilter: nf_tables: fix underflow in object reference counter Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 07/14] netfilter: nf_tables: disallow element updates of bound anonymous sets Pablo Neira Ayuso
2023-06-19 14:57 ` [PATCH net 08/14] netfilter: nf_tables: reject unbound anonymous set before commit phase Pablo Neira Ayuso
2023-06-19 20:02 ` Simon Horman
2023-06-19 14:58 ` [PATCH net 09/14] netfilter: nf_tables: reject unbound chain " Pablo Neira Ayuso
2023-06-19 14:58 ` [PATCH net 10/14] netfilter: nf_tables: disallow updates of anonymous sets Pablo Neira Ayuso
2023-06-19 14:58 ` [PATCH net 11/14] netfilter: nf_tables: disallow timeout for " Pablo Neira Ayuso
2023-06-19 14:58 ` [PATCH net 12/14] netfilter: nf_tables: drop module reference after updating chain Pablo Neira Ayuso
2023-06-19 14:58 ` [PATCH net 13/14] netfilter: nfnetlink_osf: fix module autoload Pablo Neira Ayuso
2023-06-19 14:58 ` [PATCH net 14/14] netfilter: nf_tables: Fix for deleting base chains with payload Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2023-06-20 9:35 [PATCH net 00/14,v2] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2023-06-20 9:35 ` [PATCH net 02/14] netfilter: nf_tables: fix chain binding transaction logic Pablo Neira Ayuso
2023-06-21 10:07 [PATCH net,v3 00/14] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2023-06-21 10:07 ` [PATCH net 02/14] netfilter: nf_tables: fix chain binding transaction logic 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=ZJCzcufoMlCGE64U@corigine.com \
--to=simon.horman@corigine$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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