[SRU][Xenial][PATCH 0/1] Revert "netfilter: synproxy: fix conntrackd interaction"

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[SRU][Xenial][PATCH 0/1] Revert "netfilter: synproxy: fix conntrackd interaction"

Joseph Salisbury-3
BugLink: http://bugs.launchpad.net/bugs/1709032

== SRU Justification ==
Xenial Commit 2ad4caea651(Mainline commit 87e94dbc210a7) introduced a regression in bug 1709032.
The bug is 100% repeatable and his been reproduced by several people.


== Fix ==
A revert of mainline commit 87e94dbc210a7(Xenial commit 2ad4caea651).

== Test Case ==
A test kernel was built with this patch and tested by the original bug reporter.
The bug reporter states the test kernel resolved the bug.


Joseph Salisbury (1):
  Revert "netfilter: synproxy: fix conntrackd interaction"

 net/netfilter/nf_conntrack_netlink.c | 4 ----
 1 file changed, 4 deletions(-)

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[SRU][Xenial][PATCH 1/1] Revert "netfilter: synproxy: fix conntrackd interaction"

Joseph Salisbury-3
BugLink: http://bugs.launchpad.net/bugs/1709032

This reverts commit 2ad4caea651e1cc0fc86111ece9f9d74de825b78.
---
 net/netfilter/nf_conntrack_netlink.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index e565b2b..9f52729 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -45,8 +45,6 @@
 #include <net/netfilter/nf_conntrack_zones.h>
 #include <net/netfilter/nf_conntrack_timestamp.h>
 #include <net/netfilter/nf_conntrack_labels.h>
-#include <net/netfilter/nf_conntrack_seqadj.h>
-#include <net/netfilter/nf_conntrack_synproxy.h>
 #ifdef CONFIG_NF_NAT_NEEDED
 #include <net/netfilter/nf_nat_core.h>
 #include <net/netfilter/nf_nat_l4proto.h>
@@ -1800,8 +1798,6 @@ 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;
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

ACK: [SRU][Xenial][PATCH 1/1] Revert "netfilter: synproxy: fix conntrackd interaction"

Colin King
On 09/08/17 22:05, Joseph Salisbury wrote:

> BugLink: http://bugs.launchpad.net/bugs/1709032
>
> This reverts commit 2ad4caea651e1cc0fc86111ece9f9d74de825b78.
> ---
>  net/netfilter/nf_conntrack_netlink.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
> index e565b2b..9f52729 100644
> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@ -45,8 +45,6 @@
>  #include <net/netfilter/nf_conntrack_zones.h>
>  #include <net/netfilter/nf_conntrack_timestamp.h>
>  #include <net/netfilter/nf_conntrack_labels.h>
> -#include <net/netfilter/nf_conntrack_seqadj.h>
> -#include <net/netfilter/nf_conntrack_synproxy.h>
>  #ifdef CONFIG_NF_NAT_NEEDED
>  #include <net/netfilter/nf_nat_core.h>
>  #include <net/netfilter/nf_nat_l4proto.h>
> @@ -1800,8 +1798,6 @@ 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;
>

Seems reasonable revert to do to address this issue.

Acked-by: Colin Ian King <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

APPLIED: [SRU][Xenial][PATCH 1/1] Revert "netfilter: synproxy: fix conntrackd interaction"

Kleber Souza
In reply to this post by Joseph Salisbury-3
Applied on xenial/master-next branch. Thanks.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Loading...