From mboxrd@z Thu Jan 1 00:00:00 1970 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 D76B2C2D0C1 for ; Thu, 19 Dec 2019 19:01:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA98B2465E for ; Thu, 19 Dec 2019 19:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782107; bh=HHdoDJ7rmZglhmmXVeqvhm7b+Zk+loPFJUyB8Ox7+cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SmU4FdkWFzjUo+YoL+XPYXgqOZEfT17Qov8XFmHL2XE3xyAHLSXdCn0WydjgSEAki aoikHymPRS7byUd9HNj32+EGyvr0FJXzAW27KYqqcmqVDgqT7sVIwfYcBkrb5xO7Vi RRPKNRq0510OJpF27bsT0myLTasDM+8SdZzaNMz4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729974AbfLSSuY (ORCPT ); Thu, 19 Dec 2019 13:50:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:44226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729970AbfLSSuX (ORCPT ); Thu, 19 Dec 2019 13:50:23 -0500 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 6CBFB2064B; Thu, 19 Dec 2019 18:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781422; bh=HHdoDJ7rmZglhmmXVeqvhm7b+Zk+loPFJUyB8Ox7+cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c8fGXNobPaa7H6Zt8WGJfFOr4JEUxaIQ+Z0ULJ/LxF4T7iuZx8H9h85weHRQ+kuUZ 5GyfaVoHrEe5RLupVZRXURDnc6fIsoOrFtA61bVnk/6adjuu4Ipobzkahm9ETfRBjl KLwKdVyKhKilVwprmpihJtp6ibqaURTyZsN2phSM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aaron Conole , "David S. Miller" Subject: [PATCH 4.14 05/36] openvswitch: support asymmetric conntrack Date: Thu, 19 Dec 2019 19:34:22 +0100 Message-Id: <20191219182855.197824990@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219182848.708141124@linuxfoundation.org> References: <20191219182848.708141124@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aaron Conole [ Upstream commit 5d50aa83e2c8e91ced2cca77c198b468ca9210f4 ] The openvswitch module shares a common conntrack and NAT infrastructure exposed via netfilter. It's possible that a packet needs both SNAT and DNAT manipulation, due to e.g. tuple collision. Netfilter can support this because it runs through the NAT table twice - once on ingress and again after egress. The openvswitch module doesn't have such capability. Like netfilter hook infrastructure, we should run through NAT twice to keep the symmetry. Fixes: 05752523e565 ("openvswitch: Interface with NAT.") Signed-off-by: Aaron Conole Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/openvswitch/conntrack.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -879,6 +879,17 @@ static int ovs_ct_nat(struct net *net, s } err = ovs_ct_nat_execute(skb, ct, ctinfo, &info->range, maniptype); + if (err == NF_ACCEPT && + ct->status & IPS_SRC_NAT && ct->status & IPS_DST_NAT) { + if (maniptype == NF_NAT_MANIP_SRC) + maniptype = NF_NAT_MANIP_DST; + else + maniptype = NF_NAT_MANIP_SRC; + + err = ovs_ct_nat_execute(skb, ct, ctinfo, &info->range, + maniptype); + } + /* Mark NAT done if successful and update the flow key. */ if (err == NF_ACCEPT) ovs_nat_update_key(key, skb, maniptype);