Skip to content

Commit c92db30

Browse files
committed
netfilter: nft_set_hash: mark set element as dead when deleting from packet path
Set on the NFT_SET_ELEM_DEAD_BIT flag on this element, instead of performing element removal which might race with an ongoing transaction. Enable gc when dynamic flag is set on since dynset deletion requires garbage collection after this patch. Fixes: d0a8d87 ("netfilter: nft_dynset: support for element deletion") Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent f6c383b commit c92db30

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

net/netfilter/nft_set_hash.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,9 @@ static bool nft_rhash_delete(const struct nft_set *set,
249249
if (he == NULL)
250250
return false;
251251

252-
return rhashtable_remove_fast(&priv->ht, &he->node, nft_rhash_params) == 0;
252+
nft_set_elem_dead(&he->ext);
253+
254+
return true;
253255
}
254256

255257
static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,
@@ -412,7 +414,7 @@ static int nft_rhash_init(const struct nft_set *set,
412414
return err;
413415

414416
INIT_DEFERRABLE_WORK(&priv->gc_work, nft_rhash_gc);
415-
if (set->flags & NFT_SET_TIMEOUT)
417+
if (set->flags & (NFT_SET_TIMEOUT | NFT_SET_EVAL))
416418
nft_rhash_gc_init(set);
417419

418420
return 0;

0 commit comments

Comments
 (0)