netdev - [added to the 3.18 stable tree] VSOCK: do not disconnect socket when peer has shutdown SEND only

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1468292479-23684-185-git-send-email-sasha.levin@oracle.com>
Date:	Mon, 11 Jul 2016 23:00:37 -0400
From:	Sasha Levin <sasha.levin@...cle.com>
To:	stable@...r.kernel.org, stable-commits@...r.kernel.org
Cc:	Ian Campbell <ian.campbell@...ker.com>,
	"David S. Miller" <davem@...emloft.net>,
	Stefan Hajnoczi <stefanha@...hat.com>,
	Claudio Imbrenda <imbrenda@...ux.vnet.ibm.com>,
	Andy King <acking@...are.com>,
	Dmitry Torokhov <dtor@...are.com>,
	Jorgen Hansen <jhansen@...are.com>,
	Adit Ranadive <aditr@...are.com>, netdev@...r.kernel.org,
	Sasha Levin <sasha.levin@...cle.com>
Subject: [added to the 3.18 stable tree] VSOCK: do not disconnect socket when peer has shutdown SEND only

From: Ian Campbell <ian.campbell@...ker.com>

This patch has been added to the 3.18 stable tree. If you have any
objections, please let us know.

===============

[ Upstream commit dedc58e067d8c379a15a8a183c5db318201295bb ]

The peer may be expecting a reply having sent a request and then done a
shutdown(SHUT_WR), so tearing down the whole socket at this point seems
wrong and breaks for me with a client which does a SHUT_WR.

Looking at other socket family's stream_recvmsg callbacks doing a shutdown
here does not seem to be the norm and removing it does not seem to have
had any adverse effects that I can see.

I'm using Stefan's RFC virtio transport patches, I'm unsure of the impact
on the vmci transport.

Signed-off-by: Ian Campbell <ian.campbell@...ker.com>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: Stefan Hajnoczi <stefanha@...hat.com>
Cc: Claudio Imbrenda <imbrenda@...ux.vnet.ibm.com>
Cc: Andy King <acking@...are.com>
Cc: Dmitry Torokhov <dtor@...are.com>
Cc: Jorgen Hansen <jhansen@...are.com>
Cc: Adit Ranadive <aditr@...are.com>
Cc: netdev@...r.kernel.org
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Sasha Levin <sasha.levin@...cle.com>
---
 net/vmw_vsock/af_vsock.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 85d232b..e8d3313 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1796,27 +1796,8 @@ vsock_stream_recvmsg(struct kiocb *kiocb,
 	else if (sk->sk_shutdown & RCV_SHUTDOWN)
 		err = 0;
 
-	if (copied > 0) {
-		/* We only do these additional bookkeeping/notification steps
-		 * if we actually copied something out of the queue pair
-		 * instead of just peeking ahead.
-		 */
-
-		if (!(flags & MSG_PEEK)) {
-			/* If the other side has shutdown for sending and there
-			 * is nothing more to read, then modify the socket
-			 * state.
-			 */
-			if (vsk->peer_shutdown & SEND_SHUTDOWN) {
-				if (vsock_stream_has_data(vsk) <= 0) {
-					sk->sk_state = SS_UNCONNECTED;
-					sock_set_flag(sk, SOCK_DONE);
-					sk->sk_state_change(sk);
-				}
-			}
-		}
+	if (copied > 0)
 		err = copied;
-	}
 
 out_wait:
 	finish_wait(sk_sleep(sk), &wait);
-- 
2.5.0