From patchwork Mon Jun 1 17:54:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224905 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFBC9C433E0 for ; Mon, 1 Jun 2020 18:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A470120679 for ; Mon, 1 Jun 2020 18:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037640; bh=IUwtny+/JWT/oUv6BjzT1fZrlqINPZfCEVin8clKFn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aMqnz95QuabvzQwvZUaCHO+RgbbfIutoZgBAq7uNusafDcxyTFWSiEmpa3slkBFQC 7wAQ3mrHrQm4h9sW1IimsFXGK3Um+j6qmsytbCStvuQAqU1mQHy96SK2Jz58bYgnhr DLsqCe+50e1htx/e262N1Ftk85+7ssAQdkGxfCJA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730090AbgFASx4 (ORCPT ); Mon, 1 Jun 2020 14:53:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729935AbgFASC3 (ORCPT ); Mon, 1 Jun 2020 14:02:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5F852065C; Mon, 1 Jun 2020 18:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034548; bh=IUwtny+/JWT/oUv6BjzT1fZrlqINPZfCEVin8clKFn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bGfl50dLfOY/5oQXTbDbzFdX/OvJwjrX1/vtSxxNR3pnqYgwjXXH/V0nOyoHOBGO4 4zKvrs6cE0lDF8zVeT4a/P2HdJdwZtXo7SgQHNjDKKDLsl/Zpcys5nsozBngujTmJE GKvpehUR6TWjWii66JFVJiXGEnQ6LVzU14fmVDq8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Sutter , Pablo Neira Ayuso Subject: [PATCH 4.14 64/77] netfilter: ipset: Fix subcounter update skip Date: Mon, 1 Jun 2020 19:54:09 +0200 Message-Id: <20200601174027.423091577@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174016.396817032@linuxfoundation.org> References: <20200601174016.396817032@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Phil Sutter 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 Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- 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 @@ -61,7 +61,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)))