netfilter: ipset: Fix subcounter update skip
Subsystems (2)
Phil Sutter
reviewerPATCH 1/1 netfilter: ipset: Fix subcounter update skip
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 <[email protected]>
--- net/netfilter/ipset/ip_set_list_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -59,7 +59,7 @@ list_set_ktest(struct ip_set *set, const struct sk_buff *skb,/* 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) { ret =ip_set_test (e->id, skb, par, opt);if (ret <=0 )
Signature · 1 line
2.26.2
Quoted 3 lines · Phil Sutter
If
IPSET_FLAG_SKIP_SUBCOUNTER_UPDATEis set, user requested to not update counters in sub sets. ThereforeIPSET_FLAG_SKIP_COUNTER_UPDATEmust be set, not unset.
Applied, thanks.