lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 242/639] netfilter: nft_set_hash: bogus element self comparison from deactivation path
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    [ Upstream commit a01cbae57ec29b161d42ee1caa4ffffda5d519c2 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nft_set_hash.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
    index 8dde4bfe8b8a4..05118e03c3e48 100644
    --- a/net/netfilter/nft_set_hash.c
    +++ b/net/netfilter/nft_set_hash.c
    @@ -555,7 +555,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);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:13    [W:2.360 / U:2.784 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site