Skip to content

Commit d1dccb9

Browse files
committed
netfilter: nf_tables: disable toggling dormant table state more than once
jira VUlN-597 subsystem-sync netfilter:nf_tables 4.18.0-553 commit-author Florian Westphal <[email protected]> commit c9bd265 upstream-diff Onced again cherry-pick pulls in unrelated cruft, the patch itself is fine - as per usual the source of truth is rocky8_10 branch. nft -f -<<EOF add table ip t add table ip t { flags dormant; } add chain ip t c { type filter hook input priority 0; } add table ip t EOF Triggers a splat from nf core on next table delete because we lose track of right hook register state: WARNING: CPU: 2 PID: 1597 at net/netfilter/core.c:501 __nf_unregister_net_hook RIP: 0010:__nf_unregister_net_hook+0x41b/0x570 nf_unregister_net_hook+0xb4/0xf0 __nf_tables_unregister_hook+0x160/0x1d0 [..] The above should have table in *active* state, but in fact no hooks were registered. Reject on/off/on games rather than attempting to fix this. Fixes: 179d9ba ("netfilter: nf_tables: fix table flag updates") Reported-by: "Lee, Cherie-Anne" <[email protected]> Cc: Bing-Jhong Billy Jheng <[email protected]> Cc: [email protected] Signed-off-by: Florian Westphal <[email protected]> (cherry picked from commit c9bd265) Signed-off-by: Greg Rose <[email protected]>
1 parent 95b04bb commit d1dccb9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,10 @@ static int nf_tables_updtable(struct nft_ctx *ctx)
970970
if (flags == ctx->table->flags)
971971
return 0;
972972

973+
/* No dormant off/on/off/on games in single transaction */
974+
if (ctx->table->flags & __NFT_TABLE_F_UPDATE)
975+
return -EINVAL;
976+
973977
trans = nft_trans_alloc(ctx, NFT_MSG_NEWTABLE,
974978
sizeof(struct nft_trans_table));
975979
if (trans == NULL)

0 commit comments

Comments
 (0)