Skip to content

Commit 9744a6f

Browse files
committed
netfilter: nf_tables: check if same extensions are set when adding elements
If no NLM_F_EXCL is set and the element already exists in the set, make sure that both elements have the same extensions. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 1519fcc commit 9744a6f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3749,6 +3749,11 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
37493749
err = set->ops->insert(ctx->net, set, &elem, &ext2);
37503750
if (err) {
37513751
if (err == -EEXIST) {
3752+
if (nft_set_ext_exists(ext, NFT_SET_EXT_DATA) ^
3753+
nft_set_ext_exists(ext2, NFT_SET_EXT_DATA) ||
3754+
nft_set_ext_exists(ext, NFT_SET_EXT_OBJREF) ^
3755+
nft_set_ext_exists(ext2, NFT_SET_EXT_OBJREF))
3756+
return -EBUSY;
37523757
if ((nft_set_ext_exists(ext, NFT_SET_EXT_DATA) &&
37533758
nft_set_ext_exists(ext2, NFT_SET_EXT_DATA) &&
37543759
memcmp(nft_set_ext_data(ext),

0 commit comments

Comments
 (0)