Commit 7cb9a23d authored by Florian Westphal's avatar Florian Westphal
Browse files

netfilter: nf_tables: always walk all pending catchall elements 



During transaction processing we might have more than one catchall element:
1 live catchall element and 1 pending element that is coming as part of the
new batch.

If the map holding the catchall elements is also going away, its
required to toggle all catchall elements and not just the first viable
candidate.

Otherwise, we get:
 WARNING: ./include/net/netfilter/nf_tables.h:1281 at nft_data_release+0xb7/0xe0 [nf_tables], CPU#2: nft/1404
 RIP: 0010:nft_data_release+0xb7/0xe0 [nf_tables]
 [..]
 __nft_set_elem_destroy+0x106/0x380 [nf_tables]
 nf_tables_abort_release+0x348/0x8d0 [nf_tables]
 nf_tables_abort+0xcf2/0x3ac0 [nf_tables]
 nfnetlink_rcv_batch+0x9c9/0x20e0 [..]

Fixes: 628bd3e4 ("netfilter: nf_tables: drop map element references from preparation phase")
Reported-by: default avatarYiming Qian <yimingqian591@gmail.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent b7cdc5a9

net/netfilter/nf_tables_api.c

+0 −2
Original line number Diff line number Diff line
@@ -829,7 +829,6 @@ static void nft_map_catchall_deactivate(const struct nft_ctx *ctx, 


		nft_set_elem_change_active(ctx->net, set, ext);

		nft_setelem_data_deactivate(ctx->net, set, catchall->elem);

		break;

	}

}
@@ -5873,7 +5872,6 @@ static void nft_map_catchall_activate(const struct nft_ctx *ctx, 


		nft_clear(ctx->net, ext);

		nft_setelem_data_activate(ctx->net, set, catchall->elem);

		break;

	}

}