Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 73F9F2F531B; Sat, 12 Sep 2026 15:12:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789225924; cv=none; b=J6rKCwBC8BNssRTjEbfyaapFFIoUIzpS1EjC0xmUpv6p6pQx8S9f3y0m73bNQ0UHakm2pPfF7T3mkZHVztrHniBGrSlze1Ne69UOUKlCpdIgOKqe9nAaXSCD0+ieynKS9iHvJsrR+2qxm8+vGe4qcL4w8Po7A1fpi+jSzCuN3f8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789225924; c=relaxed/simple; bh=KxaY8XkeRkoA3FlOaUpInr+OxjekCIcQRdS4d8QDfE0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j0p+G9RQ3sjQMLuJ6H69a5Zn5PA6tIUE8Z2TXjQaWP9fjasM1VtEjry09IWCfWlijEbh1mBn6MaXty6cWEFmdjD5ABSTo0pPYyYRNItzkpVHV+4zs7IYRmD/GnCjwFna76NhQRJ1PxmEAYfhfEyx4yGNCA/og0YZOQ0FPWQffGo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xDbLY7hF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xDbLY7hF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77AB81F000FF; Sat, 12 Sep 2026 15:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789225923; bh=20s6vwS+t+NQKn2UxVsKYNlb/AO2AAICaYbLO8c7lSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xDbLY7hFI5OTuRO4dyO06lGrAAS7VWFIFZ/YYeetQC9j+Nuy/kCE6aX3IovTR5hUp 4BQmMfv7+fXKSWEHTJKQc3uKyfpFdvD+f6i0w2MpvcYZc3zgHmTLD51RzJWTRReng5 YlXX3gC7nf8F34EYR+CHRibdSmktItAPyquKqQ9Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wupeng Ma , Stefano Garzarella , Nguyen Dinh Phi , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6 1297/1424] vsock: use sock_error() to consume sk_err after a failed connect Date: Sat, 12 Sep 2026 09:02:09 +0200 Message-ID: <20260912065636.313998035@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nguyen Dinh Phi [ Upstream commit 96cbf89993091a163bfedec52a3bd683dc94b3b4 ] vsock_connect() returns sk_err to userspace but does not clear it: if (sk->sk_err) { err = -sk->sk_err; For a blocking connect() the error has already been delivered as connect()'s return value, so leaving it set causes subsequent operations like poll()/epoll() to keep reporting POLLERR even though the connect failure was already delivered. The error should be consumed once it has been returned to userspace. Switch to sock_error(), which reads and clears sk_err atomically, matching the behavior of other protocol implementations such as __inet_stream_connect(). Fixes: d021c344051a ("VSOCK: Introduce VM Sockets") Tested-by: Wupeng Ma Reviewed-by: Stefano Garzarella Signed-off-by: Nguyen Dinh Phi Link: https://patch.msgid.link/20260813173024.2362935-4-phind.uet@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/vmw_vsock/af_vsock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index a06f708f300c4..1392fcde77764 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1605,12 +1605,10 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr, prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); } - if (sk->sk_err) { - err = -sk->sk_err; + err = sock_error(sk); + if (err) { sk->sk_state = TCP_CLOSE; sock->state = SS_UNCONNECTED; - } else { - err = 0; } out_wait: -- 2.53.0