diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-05-11 17:41:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-17 11:11:48 +0200 |
| commit | d110b07bef0a03674ce8d31ad9ed64507d466dfe (patch) | |
| tree | b95109c3744005afa97bedd1d993fff9dae42b17 | |
| parent | 8c239578182b98ea4bd3fe93a6db8d4b8a3bd60a (diff) | |
| download | linux-d110b07bef0a03674ce8d31ad9ed64507d466dfe.tar.gz linux-d110b07bef0a03674ce8d31ad9ed64507d466dfe.tar.bz2 linux-d110b07bef0a03674ce8d31ad9ed64507d466dfe.zip | |
netfilter: nft_hash: fix nft_hash_deactivate
[ backport for 4.14 of 7f4dae2d7f03d2aaf3b7d8343d4509c8d9d7ca9b ]
Jindřich Makovička says:
The logical OR looks fishy to me. Shouldn't be && there instead?
Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1199
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/netfilter/nft_set_hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c index a684234bd229..eb7db31dd173 100644 --- a/net/netfilter/nft_set_hash.c +++ b/net/netfilter/nft_set_hash.c @@ -520,7 +520,7 @@ static void *nft_hash_deactivate(const struct net *net, hash = nft_jhash(set, priv, &this->ext); hlist_for_each_entry(he, &priv->table[hash], node) { if (!memcmp(nft_set_ext_key(&this->ext), &elem->key.val, - set->klen) || + set->klen) && nft_set_elem_active(&he->ext, genmask)) { nft_set_elem_change_active(net, set, &he->ext); return he; |