Cc'ing David: On Fri, Jan 06, 2017 at 08:33:28PM +0100, Pau Espin Pedrol wrote: > From: Pau Espin Pedrol <[email protected]> > > Otherwise, RST packets generated by the TCP stack for non-existing > sockets always have mark 0. > The mark from the original packet is assigned to the netns_ipv4/6 > socket used to send the response so that it can get copied into the > response skb when the socket sends it.
@David, unless you want me to follow a different path, I'll take this small chunk into my nf tree. Netfilter specific fix for REJECT target comes at: http://patchwork.ozlabs.org/patch/712119/ Thanks! > Fixes: e110861f8609 ("net: add a sysctl to reflect the fwmark on replies") > Cc: Lorenzo Colitti <[email protected]> > Signed-off-by: Pau Espin Pedrol <[email protected]> > --- > net/ipv4/ip_output.c | 1 + > net/ipv6/tcp_ipv6.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c > index fac275c48108..b67719f45953 100644 > --- a/net/ipv4/ip_output.c > +++ b/net/ipv4/ip_output.c > @@ -1629,6 +1629,7 @@ void ip_send_unicast_reply(struct sock *sk, struct > sk_buff *skb, > sk->sk_protocol = ip_hdr(skb)->protocol; > sk->sk_bound_dev_if = arg->bound_dev_if; > sk->sk_sndbuf = sysctl_wmem_default; > + sk->sk_mark = fl4.flowi4_mark; > err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base, > len, 0, &ipc, &rt, MSG_DONTWAIT); > if (unlikely(err)) { > diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c > index 73bc8fc68acd..2b20622a5824 100644 > --- a/net/ipv6/tcp_ipv6.c > +++ b/net/ipv6/tcp_ipv6.c > @@ -840,6 +840,7 @@ static void tcp_v6_send_response(const struct sock *sk, > struct sk_buff *skb, u32 > dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL); > if (!IS_ERR(dst)) { > skb_dst_set(buff, dst); > + ctl_sk->sk_mark = fl6.flowi6_mark; > ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass); > TCP_INC_STATS(net, TCP_MIB_OUTSEGS); > if (rst) > -- > 2.11.0 > > > -- > > ------------------------------ > DISCLAIMER. > This email and any files transmitted with it are confidential and intended > solely for the use of the individual or entity to whom they are addressed. > If you have received this email in error please notify the system manager. > This message contains confidential information and is intended only for the > individual named. If you are not the named addressee you should not > disseminate, distribute or copy this e-mail. Please notify the sender > immediately by e-mail if you have received this e-mail by mistake and > delete this e-mail from your system. If you are not the intended recipient > you are notified that disclosing, copying, distributing or taking any > action in reliance on the contents of this information is strictly > prohibited. > -- > To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
