lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: d0a8d877da ("netfilter: nft_dynset: support for element deletion")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 85520a1f1d)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I21bc35c21e35a44753b18f31169c588f8ac70eba
This commit is contained in:
Pablo Neira Ayuso 2023-11-21 13:13:17 +01:00 committed by Lee Jones
parent a65e87c130
commit bdb31e6ebb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netfilter/nft_set_hash.c
View File

@ -251,7 +251,9 @@ static bool nft_rhash_delete(const struct nft_set *set,
if (he == NULL) if (he == NULL)
return false; 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, 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; return err;
INIT_DEFERRABLE_WORK(&priv->gc_work, nft_rhash_gc); 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); nft_rhash_gc_init(set);
return 0; return 0;