From patchwork Fri Aug 11 13:28:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 800556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="vJnsf46l"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xTQnH1QsHz9sR9; Fri, 11 Aug 2017 23:28:34 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dg9zL-0006fT-Vk; Fri, 11 Aug 2017 13:28:31 +0000 Received: from mail-wm0-f45.google.com ([74.125.82.45]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1dg9zF-0006d8-4a for kernel-team@lists.ubuntu.com; Fri, 11 Aug 2017 13:28:25 +0000 Received: by mail-wm0-f45.google.com with SMTP id f15so47444414wmg.1 for ; Fri, 11 Aug 2017 06:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=Tg7JZzfLUGVp9gETf10Um4tYaOpUyJjrf7qHG7CjSpA=; b=vJnsf46l+HkYWaCGv5igt12Qr2mI9IjTWCheZNrOOsfhI143+LUwclcl9/pTdXykrY 4YZp6HHSvDoHoHfFYqNS+JLjhMpVF9jSP69gZ1mYrWHyjDVoXUNcPwalcKuod7kQxIme m8RM9amy/R296fn/K7HX9Z/EqaGWkhkyOmMv5v9pPkPgGXoRRghn6xCHUNm0jAHj5ojc bYbbm2eRF3gzCwtYnE9Ke43/j2hkDpKwSFS6Ezc2vN8gGlMx9fFFsEkCO2h1evYm4G8w VQXcaDO//fhOpGkoicks3pWgsqX6XMGtphsxvLe5yCyUTnlgwQHVdq2PX31jf/kCcsg3 QPMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Tg7JZzfLUGVp9gETf10Um4tYaOpUyJjrf7qHG7CjSpA=; b=cmRhCyCTtClvk0hl4h1DJI0OZBpGw6rRFbBekTkK6MvyDEqwSe+UaSWyrl4uyqZriX FGculjglqC9cjug1oo90UTP6oC4Gax1hG0o5BICFHHSsNyZ+RH6dWdxIguTPMYKvHBKi +uQtuu+M33zRYtGEJLgejGBuxgVblII6LQPiBhXkxnAzN4y039y78R85rklmcJJCR5w/ 8yYLC4q306xXnOeYZv1zpyDFxbzRAPo61fDYcqWV3cMIR9saV5zFOSiqNdpK/sXhawaS QgKzFpf94/5tubHxD7nHWTzdzA+YeOokaSLDc+nur1EylbA8KW9NukiTPAFbPsD/Uzcl nLAw== X-Gm-Message-State: AHYfb5heNshMh9HPMVH8ndRUFdkXATQGWbgCundRQZ+cPVErT+ZVwtCG 3DpstbRGOLq0jb1IApB1ZA== X-Received: by 10.80.204.137 with SMTP id q9mr16162123edi.255.1502458104512; Fri, 11 Aug 2017 06:28:24 -0700 (PDT) Received: from localhost ([2a02:8109:a540:7e8:b97b:6fe3:d935:b537]) by smtp.gmail.com with ESMTPSA id w31sm666865edd.30.2017.08.11.06.28.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Aug 2017 06:28:23 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [Xenial][PATCH 1/2] Revert "Revert "netfilter: synproxy: fix conntrackd interaction"" Date: Fri, 11 Aug 2017 15:28:20 +0200 Message-Id: <20170811132821.21306-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170811132821.21306-1-kleber.souza@canonical.com> References: <20170811132821.21306-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1709032 This reverts commit f58e6473b4e026aa2dbd14f008a16b19a0359ad6. Signed-off-by: Kleber Sacilotto de Souza --- net/netfilter/nf_conntrack_netlink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 9f5272968abb..e565b2becb14 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -45,6 +45,8 @@ #include #include #include +#include +#include #ifdef CONFIG_NF_NAT_NEEDED #include #include @@ -1798,6 +1800,8 @@ ctnetlink_create_conntrack(struct net *net, nf_ct_tstamp_ext_add(ct, GFP_ATOMIC); nf_ct_ecache_ext_add(ct, 0, 0, GFP_ATOMIC); nf_ct_labels_ext_add(ct); + nfct_seqadj_ext_add(ct); + nfct_synproxy_ext_add(ct); /* we must add conntrack extensions before confirmation. */ ct->status |= IPS_CONFIRMED;