From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967157AbcCQKmO (ORCPT ); Thu, 17 Mar 2016 06:42:14 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:32696 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967095AbcCQKmL (ORCPT ); Thu, 17 Mar 2016 06:42:11 -0400 Date: Thu, 17 Mar 2016 13:41:36 +0300 From: Dan Carpenter To: Pravin Shelar , Pablo Neira Ayuso , Jarno Rajahalme Cc: dev@openvswitch.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] openvswitch: using a bit shift as a mask Message-ID: <20160317104136.GC3100@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The original condition is never true. We want to test if BIT(0) is set but the code is ANDing with zero. Fixes: 05752523e565 ('openvswitch: Interface with NAT.') Signed-off-by: Dan Carpenter diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index dc5eb29..29c82d6 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -668,7 +668,7 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key, */ if (info->nat & OVS_CT_NAT && ctinfo != IP_CT_NEW && ct->status & IPS_NAT_MASK && - (!(ct->status & IPS_EXPECTED_BIT) || info->commit)) { + (!(ct->status & IPS_EXPECTED) || info->commit)) { /* NAT an established or related connection like before. */ if (CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY) /* This is the REPLY direction for a connection From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 17 Mar 2016 10:41:36 +0000 Subject: [patch] openvswitch: using a bit shift as a mask Message-Id: <20160317104136.GC3100@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Pravin Shelar , Pablo Neira Ayuso , Jarno Rajahalme Cc: dev@openvswitch.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org The original condition is never true. We want to test if BIT(0) is set but the code is ANDing with zero. Fixes: 05752523e565 ('openvswitch: Interface with NAT.') Signed-off-by: Dan Carpenter diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index dc5eb29..29c82d6 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -668,7 +668,7 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key, */ if (info->nat & OVS_CT_NAT && ctinfo != IP_CT_NEW && ct->status & IPS_NAT_MASK && - (!(ct->status & IPS_EXPECTED_BIT) || info->commit)) { + (!(ct->status & IPS_EXPECTED) || info->commit)) { /* NAT an established or related connection like before. */ if (CTINFO2DIR(ctinfo) = IP_CT_DIR_REPLY) /* This is the REPLY direction for a connection