| Message ID | 1439118856-26484-2-git-send-email-phil@nwl.cc |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09.08, Phil Sutter wrote: > This is the identical fix as "netfilter: ipt_SYNPROXY: fix sending > window update to client" but for the IPv6 variant which obviously > suffers from the same issue. Looks fine to me. Acked-by: Patrick McHardy <kaber@trash.net> (Also for the IPv4 version, which for some reason I didn't receive) > > Signed-off-by: Phil Sutter <phil@nwl.cc> > --- > Changes since v1: > - Adjust for v2 changes of first patch. > --- > net/ipv6/netfilter/ip6t_SYNPROXY.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/ipv6/netfilter/ip6t_SYNPROXY.c b/net/ipv6/netfilter/ip6t_SYNPROXY.c > index bcebc24..ebbb754 100644 > --- a/net/ipv6/netfilter/ip6t_SYNPROXY.c > +++ b/net/ipv6/netfilter/ip6t_SYNPROXY.c > @@ -243,7 +243,8 @@ synproxy_send_client_ack(const struct synproxy_net *snet, > > synproxy_build_options(nth, opts); > > - synproxy_send_tcp(snet, skb, nskb, NULL, 0, niph, nth, tcp_hdr_size); > + synproxy_send_tcp(snet, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY, > + niph, nth, tcp_hdr_size); > } > > static bool > -- > 2.1.2 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 10, 2015 at 10:06:07AM +0200, Patrick McHardy wrote: > On 09.08, Phil Sutter wrote: > > This is the identical fix as "netfilter: ipt_SYNPROXY: fix sending > > window update to client" but for the IPv6 variant which obviously > > suffers from the same issue. > > Looks fine to me. > > Acked-by: Patrick McHardy <kaber@trash.net> Also applied, thanks. > (Also for the IPv4 version, which for some reason I didn't receive) I have collapsed the IPv4 chunk into this patch, the subject patch name is: netfilter: SYNPROXY: fix sending window update to client -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/netfilter/ip6t_SYNPROXY.c b/net/ipv6/netfilter/ip6t_SYNPROXY.c index bcebc24..ebbb754 100644 --- a/net/ipv6/netfilter/ip6t_SYNPROXY.c +++ b/net/ipv6/netfilter/ip6t_SYNPROXY.c @@ -243,7 +243,8 @@ synproxy_send_client_ack(const struct synproxy_net *snet, synproxy_build_options(nth, opts); - synproxy_send_tcp(snet, skb, nskb, NULL, 0, niph, nth, tcp_hdr_size); + synproxy_send_tcp(snet, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY, + niph, nth, tcp_hdr_size); } static bool
This is the identical fix as "netfilter: ipt_SYNPROXY: fix sending window update to client" but for the IPv6 variant which obviously suffers from the same issue. Signed-off-by: Phil Sutter <phil@nwl.cc> --- Changes since v1: - Adjust for v2 changes of first patch. --- net/ipv6/netfilter/ip6t_SYNPROXY.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)