Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdb31e6e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Lee Jones
Browse files

UPSTREAM: netfilter: nft_set_hash: mark set element as dead when deleting from packet path 



commit c92db3030492b8ad1d0faace7a93bbcf53850d0c upstream.

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.

Bug: 299922216
Fixes: d0a8d877 ("netfilter: nft_dynset: support for element deletion")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 85520a1f)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I21bc35c21e35a44753b18f31169c588f8ac70eba
parent a65e87c1

net/netfilter/nft_set_hash.c

+4 −2
Original line number Diff line number Diff line
@@ -251,7 +251,9 @@ static bool nft_rhash_delete(const struct nft_set *set, 
	if (he == NULL)

		return false;



	return rhashtable_remove_fast(&priv->ht, &he->node, nft_rhash_params) == 0;

	nft_set_elem_dead(&he->ext);



	return true;

}



static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,
@@ -400,7 +402,7 @@ static int nft_rhash_init(const struct nft_set *set, 
		return err;



	INIT_DEFERRABLE_WORK(&priv->gc_work, nft_rhash_gc);

	if (set->flags & NFT_SET_TIMEOUT)

	if (set->flags & (NFT_SET_TIMEOUT | NFT_SET_EVAL))

		nft_rhash_gc_init(set);



	return 0;