From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58128 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338AbcKRKhg (ORCPT ); Fri, 18 Nov 2016 05:37:36 -0500 Subject: Patch "sock: fix sendmmsg for partial sendmsg" has been added to the 4.8-stable tree To: soheil@google.com, davem@davemloft.net, edumazet@google.com, gregkh@linuxfoundation.org, maze@google.com, ncardwell@google.com, willemb@google.com Cc: , From: Date: Fri, 18 Nov 2016 11:37:13 +0100 Message-ID: <1479465433953@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled sock: fix sendmmsg for partial sendmsg to the 4.8-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: sock-fix-sendmmsg-for-partial-sendmsg.patch and it can be found in the queue-4.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Fri Nov 18 11:35:46 CET 2016 From: Soheil Hassas Yeganeh Date: Fri, 4 Nov 2016 15:36:49 -0400 Subject: sock: fix sendmmsg for partial sendmsg From: Soheil Hassas Yeganeh [ Upstream commit 3023898b7d4aac65987bd2f485cc22390aae6f78 ] Do not send the next message in sendmmsg for partial sendmsg invocations. sendmmsg assumes that it can continue sending the next message when the return value of the individual sendmsg invocations is positive. It results in corrupting the data for TCP, SCTP, and UNIX streams. For example, sendmmsg([["abcd"], ["efgh"]]) can result in a stream of "aefgh" if the first sendmsg invocation sends only the first byte while the second sendmsg goes through. Datagram sockets either send the entire datagram or fail, so this patch affects only sockets of type SOCK_STREAM and SOCK_SEQPACKET. Fixes: 228e548e6020 ("net: Add sendmmsg socket system call") Signed-off-by: Soheil Hassas Yeganeh Signed-off-by: Eric Dumazet Signed-off-by: Willem de Bruijn Signed-off-by: Neal Cardwell Acked-by: Maciej Żenczykowski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/socket.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/socket.c +++ b/net/socket.c @@ -2041,6 +2041,8 @@ int __sys_sendmmsg(int fd, struct mmsghd if (err) break; ++datagrams; + if (msg_data_left(&msg_sys)) + break; cond_resched(); } Patches currently in stable-queue which might be from soheil@google.com are queue-4.8/net-clear-sk_err_soft-in-sk_clone_lock.patch queue-4.8/tcp-fix-return-value-for-partial-writes.patch queue-4.8/sock-fix-sendmmsg-for-partial-sendmsg.patch