From patchwork Tue Jun 14 12:13:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 635217 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rTT8G1J9hz9s2k for ; Tue, 14 Jun 2016 22:13:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=N1gtmzck; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751417AbcFNMNt (ORCPT ); Tue, 14 Jun 2016 08:13:49 -0400 Received: from m12-17.163.com ([220.181.12.17]:48812 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbcFNMNs (ORCPT ); Tue, 14 Jun 2016 08:13:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=8ufLhqzvDhrINzUXEn 2thpVDTpWL13ow2JDU/nf1Xx8=; b=N1gtmzckJnkOl75rsRo/lAIMdH0KFffeBN K3gV8twBIF99/dL6yv+lhNuyO5QDBsdQeTd+X9DwxziHp0ztlre9/fBcRaepllLQ kr1xhoQAhQr+qW+cJ/S4BGULsbwBX2iiEAPSQgaRx7rxg5Vq/9pAxoFKyhCFQ2yI 3xtIYlDcY= Received: from MiWiFi-R2D-srv.localdomain (unknown [101.93.167.24]) by smtp13 (Coremail) with SMTP id EcCowAA3Hnvl9F9XpQuCAw--.7687S2; Tue, 14 Jun 2016 20:13:35 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Liping Zhang , Patrick McHardy Subject: [PATCH nf-next] netfilter: nf_tables: fix a wrong check to skip the inactive rules Date: Tue, 14 Jun 2016 20:13:04 +0800 Message-Id: <1465906384-55985-1-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 X-CM-TRANSID: EcCowAA3Hnvl9F9XpQuCAw--.7687S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Gw1xKw4rXr1kWw1UGrykXwb_yoWfuwc_G3 40q3sFgFWrA3s2kw4rXF43Zry293yUuF4fXryI9rWqvrWUKr109rZ7Xr9Yvw4UWw4Uury5 G3s7Jrn5t3y5CjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnVOJUUUUUU== X-Originating-IP: [101.93.167.24] X-CM-SenderInfo: x2os00perg5qqrwthudrp/xtbBUQ+Il1aDqV1GbwAAsJ Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang nft_genmask_cur has already done left-shift operator on the gencursor, so there's no need to do left-shift operator on it again. Fixes: ea4bd995b0f2 ("netfilter: nf_tables: add transaction helper functions") Cc: Patrick McHardy Signed-off-by: Liping Zhang --- net/netfilter/nf_tables_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c index e9f8dff..fb8b589 100644 --- a/net/netfilter/nf_tables_core.c +++ b/net/netfilter/nf_tables_core.c @@ -143,7 +143,7 @@ next_rule: list_for_each_entry_continue_rcu(rule, &chain->rules, list) { /* This rule is not active, skip. */ - if (unlikely(rule->genmask & (1 << gencursor))) + if (unlikely(rule->genmask & gencursor)) continue; rulenum++;