diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-02-25 14:13:42 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-02-27 11:08:31 +0100 |
| commit | a01cbae57ec29b161d42ee1caa4ffffda5d519c2 (patch) | |
| tree | d73a4f5a7f11b7fe454491b043fc9edc3729aef4 /net/netfilter | |
| parent | netfilter: nft_set_hash: fix lookups with fixed size hash on big endian (diff) | |
| download | linux-dev-a01cbae57ec29b161d42ee1caa4ffffda5d519c2.tar.xz linux-dev-a01cbae57ec29b161d42ee1caa4ffffda5d519c2.zip | |
netfilter: nft_set_hash: bogus element self comparison from deactivation path
Use the element from the loop iteration, not the same element we want to
deactivate otherwise this branch always evaluates true.
Fixes: 6c03ae210ce3 ("netfilter: nft_set_hash: add non-resizable hashtable implementation")
Reported-by: Florian Westphal <fw@strlen.de>
Tested-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -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 8d5611634a56..f4da3677bdfc 100644 --- a/net/netfilter/nft_set_hash.c +++ b/net/netfilter/nft_set_hash.c @@ -541,7 +541,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, + if (!memcmp(nft_set_ext_key(&he->ext), &elem->key.val, set->klen) && nft_set_elem_active(&he->ext, genmask)) { nft_set_elem_change_active(net, set, &he->ext); |