From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793209914; b=fcUdDJhHd29Pe1MRS65Qulcd9C3Qy6aX5I5gKv0KYWioLZdz9UZva90CIicxzpXd8sOe /6Y+doM3dD92BZK+xwRGMvopYUK52GQIIdJz0/PybQ4XQo/4o9DCJcnux+fxeQM8OZeZk o79a5bnkr3v5tlrqRzzGMU5en3MZ3jV/QE5kszkq2uPiL57IQINabuLr3jRfyXkzmA3SB mzW9jg6EdwDRRr6CEARUXnYAZCkpjtJ6zRkU6FrP5tIr9dflL4yj+C+F/FCVgiJbopDa4 DtgA1N/JlEPyrocatfhyplc0NfvNKuu/Lapxp+ZJ+4LlB8Id5xT9/Hj3tRU3pNpYF7Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793209914; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=051VdrEby2BmHmd3dEIxzAPAlB9Z0/jlTnUZ4whgOa8=; b=wCGU5brJ+0OM3aTepEN6m9NANZVFMpEyvzfky1B1Oyf9Wn5PZ4rbBykS7qiZjDCHcd7N DNldLWcerALQ6X0MqaH2ABho3L7R+V0ybEpOUWZTyYzl7NigOvOZD9Utc/nMxHY1nPl+4 TcsE3FXtQjzIgkoPa7fkv7u8Kl38fG54aMDwRaGw0WkkGhrr/aPvQYHSDxAAeNd8k8Xvk ++8tb4Pmgv9YXldFGY9Oqs4vKTjJ4C3Q2+2smHE6bNs4S56oZZWwT21Ms26vfj+k4g7BG iAgRGhOoKQ7nJ8RjFVe+meIR9SZi0zyyStbF8I8BcD+IgBz+g7W6EJTMJ08tEGfhBCg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OJZ9Gxrt; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43161606A31D; Wed, 28 Oct 2026 17:51:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OJZ9Gxrt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AD0B1F031E7; Wed, 28 Oct 2026 17:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793209913; bh=051VdrEby2BmHmd3dEIxzAPAlB9Z0/jlTnUZ4whgOa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OJZ9Gxrtlntxwr1FahlK+po1NMfV+H9vlEtoZqQNM7daExPPlM4ZqsbxBRisf9zdJ iMoW0rc9PM5b0HmweM9zuEk1zbP8abL3bHLNcFVLKR+GQ6f1Ny7YEvK831XhOOB48T FP/1NaS/6At832MzSgoh8j8UwZESRPAZwBQ+OZlA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hyunwoo Kim , Michal Luczaj , Stefano Garzarella , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6 012/168] vsock: treat TCP_CLOSING as once-established Date: Wed, 28 Oct 2026 17:59:08 +0100 Message-ID: <20261028165943.388666969@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028165943.089486480@linuxfoundation.org> References: <20261028165943.089486480@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Luczaj [ Upstream commit 4f6ac74fa594a918d41255c941256e1d51592d3b ] Handle the TCP_ESTABLISHED -> TCP_CLOSING transition on OP_RST, which can race with the connect loop. Immediately break and return 0 on ESTABLISHED/CLOSING. The return value of connect() should reflect what happened up to the point the connection was established or failed. Events that occur afterwards must not affect it. E.g. even if OP_RW has already set sk_err, connect() should still return 0, not ENOBUFS because of it. Adapt the inaccurate comment above signal_pending(). Resetting a socket that is still present in connected_table can lead to memory corruption. The reporter noted lost transports for in-flight skbs, and I have reproduced crashes caused by re-insertion into connected_table. list_add double add: new=, prev=, next=. kernel BUG at lib/list_debug.c:35! Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI Workqueue: vsock-loopback vsock_loopback_work RIP: 0010:__list_add_valid_or_report+0x11f/0x130 Call Trace: vsock_insert_connected.cold+0xe/0x13 virtio_transport_recv_pkt+0x10e9/0x1460 vsock_loopback_work+0x305/0x480 process_one_work+0xe4c/0x1560 worker_thread+0x4f1/0xd60 kthread+0x36e/0x470 ret_from_fork+0x47b/0x6b0 ret_from_fork_asm+0x1a/0x30 This fix is supplementary to commit 002541ef650b ("vsock: Ignore signal/timeout on connect() if already established"). Details under Link. Fixes: d021c344051a ("VSOCK: Introduce VM Sockets") Reported-by: Hyunwoo Kim Link: https://lore.kernel.org/netdev/anzT1fREOSyHT99k@v4bel/ Signed-off-by: Michal Luczaj Reviewed-by: Stefano Garzarella Link: https://patch.msgid.link/20261005-vsock-connect-reset-closing-v4-1-15d41cfda3ed@rbox.co Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/vmw_vsock/af_vsock.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 6b7bdd6166c06..8be8d7c55034c 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1565,23 +1565,22 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr, timeout = schedule_timeout(timeout); lock_sock(sk); - /* Connection established. Whatever happens to socket once we - * release it, that's not connect()'s concern. No need to go + /* Connection was established. Whatever happens to socket once + * we release it, that's not connect()'s concern. No need to go * into signal and timeout handling. Call it a day. * * Note that allowing to "reset" an already established socket * here is racy and insecure. */ - if (sk->sk_state == TCP_ESTABLISHED) - break; + if (sk->sk_state == TCP_ESTABLISHED || + sk->sk_state == TCP_CLOSING) { + err = 0; + goto out_wait; + } /* If connection was _not_ established and a signal/timeout came * to be, we want the socket's state reset. User space may want - * to retry. - * - * sk_state != TCP_ESTABLISHED implies that socket is not on - * vsock_connected_table. We keep the binding and the transport - * assigned. + * to retry, so we keep the binding and the transport assigned. */ if (signal_pending(current) || timeout == 0) { err = timeout == 0 ? -ETIMEDOUT : sock_intr_errno(timeout); -- 2.53.0