mbox series

[bionic/linux-azure,cosmic/linux-azure,0/2] netfilter: nf_conntrack: resolve clash for matching conntracks

Message ID 20181002010738.20799-1-marcelo.cerri@canonical.com
Headers show
Series netfilter: nf_conntrack: resolve clash for matching conntracks | expand

Message

Marcelo Henrique Cerri Oct. 2, 2018, 1:07 a.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1795493


Martynas Pumputis (2):
  UBUNTU: SAUCE: netfilter: nf_conntrack: resolve clash for matching
    conntracks
  UBUNTU: SOURCE: netfilter: nf_nat: return the same reply tuple for
    matching CTs

 include/net/netfilter/nf_conntrack.h     |  5 +--
 include/net/netfilter/nf_nat.h           |  3 +-
 net/ipv4/netfilter/nf_nat_proto_gre.c    |  2 +-
 net/ipv4/netfilter/nf_nat_proto_icmp.c   |  2 +-
 net/ipv6/netfilter/nf_nat_proto_icmpv6.c |  2 +-
 net/netfilter/nf_conntrack_core.c        | 42 +++++++++++++++++-------
 net/netfilter/nf_nat_core.c              | 34 +++++++++++++++----
 net/netfilter/nf_nat_proto_common.c      |  2 +-
 8 files changed, 68 insertions(+), 24 deletions(-)

Comments

Thadeu Lima de Souza Cascardo Oct. 2, 2018, 12:13 p.m. UTC | #1
On Mon, Oct 01, 2018 at 10:07:36PM -0300, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1795493

<nitpick> Please use https on the bug links.

As it's restricted to azure kernels,

Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

> 
> 
> Martynas Pumputis (2):
>   UBUNTU: SAUCE: netfilter: nf_conntrack: resolve clash for matching
>     conntracks
>   UBUNTU: SOURCE: netfilter: nf_nat: return the same reply tuple for
>     matching CTs
> 
>  include/net/netfilter/nf_conntrack.h     |  5 +--
>  include/net/netfilter/nf_nat.h           |  3 +-
>  net/ipv4/netfilter/nf_nat_proto_gre.c    |  2 +-
>  net/ipv4/netfilter/nf_nat_proto_icmp.c   |  2 +-
>  net/ipv6/netfilter/nf_nat_proto_icmpv6.c |  2 +-
>  net/netfilter/nf_conntrack_core.c        | 42 +++++++++++++++++-------
>  net/netfilter/nf_nat_core.c              | 34 +++++++++++++++----
>  net/netfilter/nf_nat_proto_common.c      |  2 +-
>  8 files changed, 68 insertions(+), 24 deletions(-)
> 
> -- 
> 2.17.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Kleber Sacilotto de Souza Oct. 11, 2018, 11:34 a.m. UTC | #2
On 10/02/18 03:07, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1795493
> 
> 
> Martynas Pumputis (2):
>   UBUNTU: SAUCE: netfilter: nf_conntrack: resolve clash for matching
>     conntracks
>   UBUNTU: SOURCE: netfilter: nf_nat: return the same reply tuple for
>     matching CTs
> 
>  include/net/netfilter/nf_conntrack.h     |  5 +--
>  include/net/netfilter/nf_nat.h           |  3 +-
>  net/ipv4/netfilter/nf_nat_proto_gre.c    |  2 +-
>  net/ipv4/netfilter/nf_nat_proto_icmp.c   |  2 +-
>  net/ipv6/netfilter/nf_nat_proto_icmpv6.c |  2 +-
>  net/netfilter/nf_conntrack_core.c        | 42 +++++++++++++++++-------
>  net/netfilter/nf_nat_core.c              | 34 +++++++++++++++----
>  net/netfilter/nf_nat_proto_common.c      |  2 +-
>  8 files changed, 68 insertions(+), 24 deletions(-)
> 

Restricted to azure kernels.

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Kleber Sacilotto de Souza Oct. 23, 2018, 8:12 a.m. UTC | #3
On 10/02/18 03:07, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1795493
> 
> 
> Martynas Pumputis (2):
>   UBUNTU: SAUCE: netfilter: nf_conntrack: resolve clash for matching
>     conntracks
>   UBUNTU: SOURCE: netfilter: nf_nat: return the same reply tuple for
>     matching CTs
> 
>  include/net/netfilter/nf_conntrack.h     |  5 +--
>  include/net/netfilter/nf_nat.h           |  3 +-
>  net/ipv4/netfilter/nf_nat_proto_gre.c    |  2 +-
>  net/ipv4/netfilter/nf_nat_proto_icmp.c   |  2 +-
>  net/ipv6/netfilter/nf_nat_proto_icmpv6.c |  2 +-
>  net/netfilter/nf_conntrack_core.c        | 42 +++++++++++++++++-------
>  net/netfilter/nf_nat_core.c              | 34 +++++++++++++++----
>  net/netfilter/nf_nat_proto_common.c      |  2 +-
>  8 files changed, 68 insertions(+), 24 deletions(-)
> 

Applied to bionic/linux-azure/master-next (with some fuzz) and
cosmic/linux-azure/master-next branches.

Thanks,
Kleber