From: Greg Kroah-Hartman Date: Wed, 3 Aug 2022 06:55:46 +0000 (+0200) Subject: drop mptcp-don-t-send-rst-for-single-subflow.patch from 5.18 X-Git-Tag: v5.4.209~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78aad63a7681cb746823a13b788548a86b54bc28;p=thirdparty%2Fkernel%2Fstable-queue.git drop mptcp-don-t-send-rst-for-single-subflow.patch from 5.18 --- diff --git a/queue-5.18/mptcp-don-t-send-rst-for-single-subflow.patch b/queue-5.18/mptcp-don-t-send-rst-for-single-subflow.patch deleted file mode 100644 index 559155dcf56..00000000000 --- a/queue-5.18/mptcp-don-t-send-rst-for-single-subflow.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0a782d12ad419f820fbaf1d637a788097014b5b1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 22 Apr 2022 14:55:36 -0700 -Subject: mptcp: don't send RST for single subflow - -From: Geliang Tang - -[ Upstream commit 1761fed2567807f26fbd53032ff622f55978c7a9 ] - -When a bad checksum is detected and a single subflow is in use, don't -send RST + MP_FAIL, send data_ack + MP_FAIL instead. - -So invoke tcp_send_active_reset() only when mptcp_has_another_subflow() -is true. - -Signed-off-by: Geliang Tang -Signed-off-by: Mat Martineau -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/mptcp/subflow.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c -index 7919e259175d..ccae50eba664 100644 ---- a/net/mptcp/subflow.c -+++ b/net/mptcp/subflow.c -@@ -1221,14 +1221,14 @@ static bool subflow_check_data_avail(struct sock *ssk) - /* RFC 8684 section 3.7. */ - if (subflow->send_mp_fail) { - if (mptcp_has_another_subflow(ssk)) { -+ ssk->sk_err = EBADMSG; -+ tcp_set_state(ssk, TCP_CLOSE); -+ subflow->reset_transient = 0; -+ subflow->reset_reason = MPTCP_RST_EMIDDLEBOX; -+ tcp_send_active_reset(ssk, GFP_ATOMIC); - while ((skb = skb_peek(&ssk->sk_receive_queue))) - sk_eat_skb(ssk, skb); - } -- ssk->sk_err = EBADMSG; -- tcp_set_state(ssk, TCP_CLOSE); -- subflow->reset_transient = 0; -- subflow->reset_reason = MPTCP_RST_EMIDDLEBOX; -- tcp_send_active_reset(ssk, GFP_ATOMIC); - WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); - return true; - } --- -2.35.1 - diff --git a/queue-5.18/series b/queue-5.18/series index 46c1b2ad7ac..2e6cfa3cf87 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -69,7 +69,6 @@ octeontx2-pf-cn10k-fix-egress-ratelimit-configuratio.patch netfilter-nf_queue-do-not-allow-packet-truncation-be.patch scsi-ufs-support-clearing-multiple-commands-at-once.patch scsi-ufs-core-fix-a-race-condition-related-to-device.patch -mptcp-don-t-send-rst-for-single-subflow.patch virtio-net-fix-the-race-between-refill-work-and-clos.patch perf-symbol-correct-address-for-bss-symbols.patch sfc-disable-softirqs-for-ptp-tx.patch