From: Greg Kroah-Hartman Date: Sat, 18 Feb 2017 15:40:08 +0000 (+0100) Subject: delete 4.4 patch X-Git-Tag: v4.4.50~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37ae1ff431bf4c7967eabff5189ecfee6fd95c4f;p=thirdparty%2Fkernel%2Fstable-queue.git delete 4.4 patch --- diff --git a/queue-4.4/series b/queue-4.4/series index dbd4ca85547..c449e450eb8 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -17,4 +17,3 @@ net-introduce-device-min_header_len.patch packet-round-up-linear-to-header-len.patch ping-fix-a-null-pointer-dereference.patch l2tp-do-not-use-udp_ioctl.patch -tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch diff --git a/queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch b/queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch deleted file mode 100644 index 1f00f04c5b2..00000000000 --- a/queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch +++ /dev/null @@ -1,46 +0,0 @@ -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)