From: Pablo Neira Ayuso Date: Mon, 25 Feb 2019 13:13:42 +0000 (+0100) Subject: netfilter: nft_set_hash: bogus element self comparison from deactivation path X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a01cbae57ec29b161d42ee1caa4ffffda5d519c2;p=linux.git 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 Tested-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c index 8d5611634a561..f4da3677bdfcb 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);