lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 33/48] netfilter: ipset: Fix subcounter update skip
    Date
    From: Phil Sutter <phil@nwl.cc>

    commit a164b95ad6055c50612795882f35e0efda1f1390 upstream.

    If IPSET_FLAG_SKIP_SUBCOUNTER_UPDATE is set, user requested to not
    update counters in sub sets. Therefore IPSET_FLAG_SKIP_COUNTER_UPDATE
    must be set, not unset.

    Fixes: 6e01781d1c80e ("netfilter: ipset: set match: add support to match the counters")
    Signed-off-by: Phil Sutter <phil@nwl.cc>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/netfilter/ipset/ip_set_list_set.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/netfilter/ipset/ip_set_list_set.c
    +++ b/net/netfilter/ipset/ip_set_list_set.c
    @@ -60,7 +60,7 @@ list_set_ktest(struct ip_set *set, const
    /* Don't lookup sub-counters at all */
    opt->cmdflags &= ~IPSET_FLAG_MATCH_COUNTERS;
    if (opt->cmdflags & IPSET_FLAG_SKIP_SUBCOUNTER_UPDATE)
    - opt->cmdflags &= ~IPSET_FLAG_SKIP_COUNTER_UPDATE;
    + opt->cmdflags |= IPSET_FLAG_SKIP_COUNTER_UPDATE;
    list_for_each_entry_rcu(e, &map->members, list) {
    if (SET_WITH_TIMEOUT(set) &&
    ip_set_timeout_expired(ext_timeout(e, set)))

    \
     
     \ /
      Last update: 2020-06-01 19:58    [W:2.406 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site