netfilter: nf_tables: don't unregister hook when table is dormant
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_tables: don't unregister hook when table is dormant
When nf_tables_updchain encounters an error, hook registration needs to be rolled back.
This should only be done if the hook has been registered, which won't happen when the table is flagged as dormant (inactive).
Just move the assignment into the registration block.
--- net/netfilter/nf_tables_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +2 -2
@@ -2840,9 +2840,9 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,if (err <0 ) goto err_hooks; } - } - unregister = true; + unregister = true; + }if (nla[NFTA_CHAIN_COUNTERS ]) {if (!nft_is_base_chain (chain)) {
Signature · 1 line
2.49.0
Pablo Neira Ayuso
maintainerHi Florian,
Quoted 7 lines · Florian Westphal
When
nf_tables_updchainencounters an error, hook registration needs to be rolled back.This should only be done if the hook has been registered, which won't happen when the table is flagged as dormant (inactive).
Just move the assignment into the registration block.
I just made another pass today on this, I think this needs to be:
net/netfilter/nf_tables_api.c +2 -2
@@ -2839,11 +2839,11 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, err =nft_netdev_register_hooks (ctx->net, &hook.list);if (err <0 ) goto err_hooks; + + unregister = true; } } - unregister = true; -if (nla[NFTA_CHAIN_COUNTERS ]) {if (!nft_is_base_chain (chain)) { err = -EOPNOTSUPP ;
This is the rationale:
- only updchain allows for adding new basechains for netdev family, this is to add new devices to this netdev basechain.
- !netdev families only check if the hook is the same in the chain update. Otherwise, it reports EEXIST. That is, chain update of !netdev families is not possible.
I am moving "unregister = true" under this check:
if (nft_base_chain_netdev(table->family, basechain->ops.hooknum)) {only in this case hook registrations can happen. Then, in case of error, unwind only applies if basechain's family is netdev.
Florian Westphal
maintainerQuoted 21 lines · Pablo Neira Ayuso
I just made another pass today on this, I think this needs to be:
net/netfilter/nf_tables_api.c +2
-2@@ -2839,11 +2839,11 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, err =nft_netdev_register_hooks (ctx->net, &hook.list);if (err <0 ) goto err_hooks; + + unregister = true; } } - unregister = true; -if (nla[NFTA_CHAIN_COUNTERS ]) {if (!nft_is_base_chain (chain)) { err = -EOPNOTSUPP ;
Quoted 1 line
This is the rationale:
[..]
I've marked the patch as rejected. I'm not sure what the pre and postconditions for non-netdev is in this function, so I won't send a v2.