diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2020-06-14 23:42:07 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-06-30 18:25:07 +0200 |
| commit | d61d2e902aa0561e5f4b6348514fb35de544aa1f (patch) | |
| tree | 7a5a5bf4ffe0be7775a9630908ed52b5882c814f /net/netfilter | |
| parent | f53b9b0bdc59c0823679f2e3214e0d538f5951b9 (diff) | |
| download | linux-d61d2e902aa0561e5f4b6348514fb35de544aa1f.tar.gz linux-d61d2e902aa0561e5f4b6348514fb35de544aa1f.tar.bz2 linux-d61d2e902aa0561e5f4b6348514fb35de544aa1f.zip | |
netfilter: nft_set_pipapo: Drop useless assignment of scratch map index on insert
In nft_pipapo_insert(), we need to reallocate scratch maps that will
be used for matching by lookup functions, if they have never been
allocated or if the bucket size changes as a result of the insertion.
As pipapo_realloc_scratch() provides a pair of fresh, zeroed out
maps, there's no need to select a particular one after reallocation.
Other than being useless, the existing assignment was also troubled
by the fact that the index was set only on the CPU performing the
actual insertion, as spotted by Florian.
Simply drop the assignment.
Reported-by: Florian Westphal <fw@strlen.de>
Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nft_set_pipapo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 8c04388296b0..313de1d73168 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1249,8 +1249,6 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set, if (err) return err; - this_cpu_write(nft_pipapo_scratch_index, false); - m->bsize_max = bsize_max; } else { put_cpu_ptr(m->scratch); |