From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8F4938DC6F for ; Fri, 9 Oct 2026 10:15:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791540934; cv=none; b=XMfsjKSD1dMf2iQlEc7ZN2h4FrAFH3B6XsyEzEMR+ImOao0EIN4BwC2O08G6vBzr+57LCyNGg3VMsWw1FG45yWgqH9sf1i3JyOaJpwms98oyN4mHHGXi+bCs8BqReoDlU6bw2+vobznhtljS8Pvks2jfbn12bkMKhbornudzvVI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791540934; c=relaxed/simple; bh=jyDEhNWEktcDeVA66O0x0HheikRt8+3NMW3l44bD31Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=fXmL8Tke/gs7Xnmpoq8rggGNsm5ndu0KqZC1PRZyxWOEg3F7OsRTHSawbP+dStXpUpQSFdu9jm+wcMKu7Cz0sBrUhEiYzUyEYqDharuYSd6O8MFzZeSmFg83Ed/7Wt0UT7187hObIBScigLcdCmLwvxesg6F/sezqIB6YpGFz+g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=EY9Fw/RE; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=L1AHSraY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EY9Fw/RE"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="L1AHSraY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1791540929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8qjpcfD3LG1eZs8VSpA9jEQmEOMfOU2B/T9s4mzaz2E=; b=EY9Fw/REWlXYsC+GShddDisGvBaikXn1kQ+CQqlvlKJboLWLkRvLCDh2Mya4QHYU9AXZAG ffC6dU0hRzUX1vW1MlopT49teKHaC7wdbmZpmafMR7gcUTas8u6hFYWWddECA62JC1Zk0o TpoRaz1JvSezMT9pxoXqpY+goaMquWg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-bolGhcYHPsC9mqyhDCk5WA-1; Fri, 09 Oct 2026 06:15:22 -0400 X-MC-Unique: bolGhcYHPsC9mqyhDCk5WA-1 X-Mimecast-MFC-AGG-ID: bolGhcYHPsC9mqyhDCk5WA_1791540921 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a166a9ea21so50084765e9.2 for ; Fri, 09 Oct 2026 03:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1791540921; x=1792145721; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=8qjpcfD3LG1eZs8VSpA9jEQmEOMfOU2B/T9s4mzaz2E=; b=L1AHSraYh9niilCYyPHgdz+agimXgXdkuvF+nfeJvFTY9Vwc+LkRnH//WkHPbN3Rfc 8XRLW4ifCjHzYObphmzK9dbpTstUmIa6qD/MktdetcLknEYgcqrYXRvdN3ccPPmzRtVE 0fV8omREyNef3RBHyuzupt6kbl1/Z234uQVST7OXva2uAKWJe7V8u6v8mSzyLFe6ouBy RiooAEswAN6o44N/j/9a8yhvk01D/Jg0Lpsp8GR7h7b8bXaZaq2J3zPDLwdVZHqPmX+e XhcdkXAYaIiyqSMSdG3Dc5gklxFRdbw1ApPMg9OKLj/7nGhygi4D/JZLJGJsfKz+QUN4 IBkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791540921; x=1792145721; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=8qjpcfD3LG1eZs8VSpA9jEQmEOMfOU2B/T9s4mzaz2E=; b=Zc8dAm1Sqyxu7gD3R35Himbh8F3AxUzkee01njIMHevHb9pM1u+XI7e6405+IkPTpl P0TxkkAsHQ2NlVonLWk89K9I4XwkcGFcDjCj85FPwX9plsKBZYZJb8BUEJQ1ixSPXExu P5vHNonOm1SnoJ912JvYzwrHrGG85gn1Ibs+t5XIHjhyMFP3E3sG4zGc9aOoAM0afx17 OoFsLM2HkGc3CgVcjv8n7TAvEqmmFxWRbIJIuorJfgKdVguK0sgBq58Mw2OZf/+tq6tQ UCWEpfrdfr3nAVjUofZW8ce4mAR9Wmligv/+yK8JyGp1V+AeTblRY84ZcLhs6M0lTmcx 2A3g== X-Forwarded-Encrypted: i=1; AKwUvBw4KPKg2LzW+pGyQCPmNbDUMPNgfr79Q3Ll/aMx30zA1EzmUkQ4UEbBHD7RXy6tpH/P1+XO36I=@vger.kernel.org X-Gm-Message-State: AFuF++l5U2jRviLHqB7I3C7BGU4CkKypC+pd6HsSmzFuTp4wX9TOZzL8 3HEoWgLRoPJr8ZtLNwyETGZKmvw0x4AiUeVzdj4yrbBetMVgy+Ilh/4VR4EUrF9vj0DVlfHxR59 y6lk6dXa9g+8u/AHRVYUHmjcBAiaIZVKpzoKSrpqV1/c9k63hQEkhkoteIQ== X-Gm-Gg: AYBFou0UdmbCx1mlEE2lPx+ELxEVkKF1uhzCK5EMtJ4yEarZwcVpAun4rQS10e2Y2eD bfZV6yVZb0uRK10tlO9hmxVdqbfnfiz8VDfy7/CJ1FFp/c+jJqLs+Aqv4kz3/DJ8tQ958VCrc6N iBWn2qWBaV2sj8JjUvk/86gdsL0EGVRaQZW8qBibza6wj3v1iAY93uEHrFNB6FKWhHyxhSgmYSV tkZSLpRfsW77NKxsx/VtB9ufFOxYo8rga9wz7XZbJtqiPcUFrM5Et7w8hpwJCu5gWRyQ9w2Ujlb PEimOjxbUl3+RsQMEh1gsbb8fitDvi+Pnm99xanVwvsDgep0WDG0Tl2wnM8GG9pZAwCSTJYTa7J A X-Received: by 2002:a05:600c:6989:b0:4a0:1f9e:5f7d with SMTP id 5b1f17b1804b1-4a18e4a0030mr24138475e9.7.1791540921036; Fri, 09 Oct 2026 03:15:21 -0700 (PDT) X-Received: by 2002:a05:600c:6989:b0:4a0:1f9e:5f7d with SMTP id 5b1f17b1804b1-4a18e4a0030mr24137885e9.7.1791540920563; Fri, 09 Oct 2026 03:15:20 -0700 (PDT) Received: from sgarzare-redhat ([5.11.115.77]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a18bea0f1csm80901885e9.9.2026.10.09.03.15.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2026 03:15:19 -0700 (PDT) Date: Fri, 9 Oct 2026 12:15:16 +0200 From: Stefano Garzarella To: Michal Luczaj Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , Eugenio =?utf-8?B?UMOpcmV6?= , "David S. Miller" , Xuan Zhuo , Jakub Kicinski , Paolo Abeni , Simon Horman , Eric Dumazet , kvm@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hyunwoo Kim Subject: Re: [PATCH net v4] vsock: treat TCP_CLOSING as once-established Message-ID: References: <20261005-vsock-connect-reset-closing-v4-0-15d41cfda3ed@rbox.co> <20261005-vsock-connect-reset-closing-v4-1-15d41cfda3ed@rbox.co> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20261005-vsock-connect-reset-closing-v4-1-15d41cfda3ed@rbox.co> On Mon, Oct 05, 2026 at 02:26:22AM +0200, Michal Luczaj wrote: >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 >--- > net/vmw_vsock/af_vsock.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) LGTM! Thanks! Reviewed-by: Stefano Garzarella > >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index 9b71479a2b29..14fe24b05f9c 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -1834,23 +1834,22 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *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.56.0 >