From patchwork Thu Nov 26 06:30:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 548933 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 9ED561402DD for ; Thu, 26 Nov 2015 17:31:07 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 85E4510CF2; Wed, 25 Nov 2015 22:31:06 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 3E82210CEE for ; Wed, 25 Nov 2015 22:31:05 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id C8FBD161139 for ; Wed, 25 Nov 2015 23:31:04 -0700 (MST) X-ASG-Debug-ID: 1448519464-03dc21603e1ccd90001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar4.cudamail.com with ESMTP id ttju9GQEZv5L1hfM (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 25 Nov 2015 23:31:04 -0700 (MST) X-Barracuda-Envelope-From: blp@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO relay5-d.mail.gandi.net) (217.70.183.197) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 26 Nov 2015 06:31:04 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.197 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.197 X-Barracuda-RBL-IP: 217.70.183.197 Received: from mfilter16-d.gandi.net (mfilter16-d.gandi.net [217.70.178.144]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 01CCB41C09D; Thu, 26 Nov 2015 07:31:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter16-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter16-d.gandi.net (mfilter16-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 1BvCoOURcSTQ; Thu, 26 Nov 2015 07:31:00 +0100 (CET) X-Originating-IP: 173.228.112.189 Received: from sigabrt.gateway.sonic.net (173-228-112-189.dsl.dynamic.fusionbroadband.com [173.228.112.189]) (Authenticated sender: blp@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 7588C41C094; Thu, 26 Nov 2015 07:30:59 +0100 (CET) X-CudaMail-Envelope-Sender: blp@ovn.org From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-1124075048 X-CudaMail-DTE: 112515 X-CudaMail-Originating-IP: 217.70.183.197 Date: Wed, 25 Nov 2015 22:30:57 -0800 X-ASG-Orig-Subj: [##CM-V2-1124075048##][PATCH] ofproto-dpif-xlate: Fix byte-order error in comparison. Message-Id: <1448519457-10446-1-git-send-email-blp@ovn.org> X-Mailer: git-send-email 2.1.3 X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1448519464 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH] ofproto-dpif-xlate: Fix byte-order error in comparison. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Found by sparse. CC: Jarno Rajahalme Signed-off-by: Ben Pfaff Acked-by: Flavio Leitner --- ofproto/ofproto-dpif-xlate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index ab4d52f..eeb919d 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -4262,11 +4262,12 @@ put_ct_nat(struct xlate_ctx *ctx) nl_msg_put_flag(ctx->odp_actions, OVS_NAT_ATTR_PROTO_RANDOM); } if (ofn->range_af == AF_INET) { - nl_msg_put_u32(ctx->odp_actions, OVS_NAT_ATTR_IP_MIN, + nl_msg_put_be32(ctx->odp_actions, OVS_NAT_ATTR_IP_MIN, ofn->range.addr.ipv4.min); if (ofn->range.addr.ipv4.max && - ofn->range.addr.ipv4.max > ofn->range.addr.ipv4.min) { - nl_msg_put_u32(ctx->odp_actions, OVS_NAT_ATTR_IP_MAX, + (ntohl(ofn->range.addr.ipv4.max) + > ntohl(ofn->range.addr.ipv4.min))) { + nl_msg_put_be32(ctx->odp_actions, OVS_NAT_ATTR_IP_MAX, ofn->range.addr.ipv4.max); } } else if (ofn->range_af == AF_INET6) {