From 286bdcd9e330bf0cdf5ea589ef6538f382e366b1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Aug 2020 13:00:27 +0200 Subject: [PATCH] drop queue-5.8/mptcp-sendmsg-reset-iter-on-error.patch --- .../mptcp-sendmsg-reset-iter-on-error.patch | 52 ------------------- queue-5.8/series | 1 - 2 files changed, 53 deletions(-) delete mode 100644 queue-5.8/mptcp-sendmsg-reset-iter-on-error.patch diff --git a/queue-5.8/mptcp-sendmsg-reset-iter-on-error.patch b/queue-5.8/mptcp-sendmsg-reset-iter-on-error.patch deleted file mode 100644 index 32d4ea8ba3c..00000000000 --- a/queue-5.8/mptcp-sendmsg-reset-iter-on-error.patch +++ /dev/null @@ -1,52 +0,0 @@ -From foo@baz Mon 17 Aug 2020 11:30:09 AM CEST -From: Florian Westphal -Date: Fri, 14 Aug 2020 15:56:34 +0200 -Subject: mptcp: sendmsg: reset iter on error - -From: Florian Westphal - -[ Upstream commit 35759383133f64d90eba120a0d3efe8f71241650 ] - -Once we've copied data from the iterator we need to revert in case we -end up not sending any data. - -This bug doesn't trigger with normal 'poll' based tests, because -we only feed a small chunk of data to kernel after poll indicated -POLLOUT. With blocking IO and large writes this triggers. Receiver -ends up with less data than it should get. - -Fixes: 72511aab95c94d ("mptcp: avoid blocking in tcp_sendpages") -Signed-off-by: Florian Westphal -Reviewed-by: Mat Martineau -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/mptcp/protocol.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/net/mptcp/protocol.c -+++ b/net/mptcp/protocol.c -@@ -605,8 +605,10 @@ static int mptcp_sendmsg_frag(struct soc - if (!psize) - return -EINVAL; - -- if (!sk_wmem_schedule(sk, psize + dfrag->overhead)) -+ if (!sk_wmem_schedule(sk, psize + dfrag->overhead)) { -+ iov_iter_revert(&msg->msg_iter, psize); - return -ENOMEM; -+ } - } else { - offset = dfrag->offset; - psize = min_t(size_t, dfrag->data_len, avail_size); -@@ -617,8 +619,10 @@ static int mptcp_sendmsg_frag(struct soc - */ - ret = do_tcp_sendpages(ssk, page, offset, psize, - msg->msg_flags | MSG_SENDPAGE_NOTLAST | MSG_DONTWAIT); -- if (ret <= 0) -+ if (ret <= 0) { -+ iov_iter_revert(&msg->msg_iter, psize); - return ret; -+ } - - frag_truesize += ret; - if (!retransmission) { diff --git a/queue-5.8/series b/queue-5.8/series index 232c19d548e..fa1ee2a1f05 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -393,7 +393,6 @@ net-refactor-bind_bucket-fastreuse-into-helper.patch net-initialize-fastreuse-on-inet_inherit_port.patch vsock-fix-potential-null-pointer-dereference-in-vsock_poll.patch net-phy-marvell10g-fix-null-pointer-dereference.patch -mptcp-sendmsg-reset-iter-on-error.patch r8152-use-mac-address-from-correct-device-tree-node.patch usb-serial-cp210x-re-enable-auto-rts-on-open.patch usb-serial-cp210x-enable-usb-generic-throttle-unthrottle.patch -- 2.47.3