From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.us.es ([193.147.175.20]:33368 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932379AbdBPTBr (ORCPT ); Thu, 16 Feb 2017 14:01:47 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id A391A2F2543 for ; Thu, 16 Feb 2017 20:01:44 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 92CBBDA809 for ; Thu, 16 Feb 2017 20:01:44 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 1089FDA816 for ; Thu, 16 Feb 2017 20:01:42 +0100 (CET) Date: Thu, 16 Feb 2017 20:01:41 +0100 From: Pablo Neira Ayuso To: gregkh@linuxfoundation.org Cc: pespin.shar@gmail.com, lorenzo@google.com, pau.espin@tessares.net, stable@vger.kernel.org, stable-commits@vger.kernel.org Subject: Re: Patch "tcp: fix mark propagation with fwmark_reflect enabled" has been added to the 4.4-stable tree Message-ID: <20170216190141.GA18589@salvia> References: <14872647496210@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <14872647496210@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: Hi Greg, if you pick this one, then you take this one as well: commit 92e55f412cffd016cc245a74278cb4d7b89bb3bc Author: Pablo Neira Date: Thu Jan 26 22:56:21 2017 +0100 tcp: don't annotate mark on control socket from tcp_v6_send_response() Since the IPv6 chunk is broken. Thanks. On Thu, Feb 16, 2017 at 09:05:49AM -0800, gregkh@linuxfoundation.org wrote: > > This is a note to let you know that I've just added the patch titled > > tcp: fix mark propagation with fwmark_reflect enabled > > to the 4.4-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch > and it can be found in the queue-4.4 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let know about it. > > > From bf99b4ded5f8a4767dbb9d180626f06c51f9881f Mon Sep 17 00:00:00 2001 > From: Pau Espin Pedrol > Date: Fri, 6 Jan 2017 20:33:28 +0100 > Subject: tcp: fix mark propagation with fwmark_reflect enabled > > From: Pau Espin Pedrol > > commit bf99b4ded5f8a4767dbb9d180626f06c51f9881f upstream. > > 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. > > Fixes: e110861f8609 ("net: add a sysctl to reflect the fwmark on replies") > Cc: Lorenzo Colitti > Signed-off-by: Pau Espin Pedrol > Signed-off-by: Pablo Neira Ayuso > Signed-off-by: Greg Kroah-Hartman > > --- > net/ipv4/ip_output.c | 1 + > net/ipv6/tcp_ipv6.c | 1 + > 2 files changed, 2 insertions(+) > > --- a/net/ipv4/ip_output.c > +++ b/net/ipv4/ip_output.c > @@ -1592,6 +1592,7 @@ void ip_send_unicast_reply(struct sock * > 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)) { > --- a/net/ipv6/tcp_ipv6.c > +++ b/net/ipv6/tcp_ipv6.c > @@ -822,6 +822,7 @@ static void tcp_v6_send_response(const s > 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_BH(net, TCP_MIB_OUTSEGS); > if (rst) > > > Patches currently in stable-queue which might be from pespin.shar@gmail.com are > > queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch