From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D87D842F6ED for ; Mon, 10 Aug 2026 17:10:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786381858; cv=none; b=BbV7abbbD6cC/lf8P7X7c9HgfRUcZsQKX7AgiHXbIGvTB2kCd6eT8gTyWw49tgyrHuZOfdXMFDWHdkeHUu+OfjBz+JUNwn3U0B+UPhxAy6E0mjsqWBAzWxrz52Zhbh+nKQU7sBq4MUekchW19ZSd83jTb8AlhA9LzyfBvhPyW6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786381858; c=relaxed/simple; bh=P9yChhC5nEAPRJBgrn49F1A2elik1HxqQF0r8qN6qek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IWr2lxBnuyDS9vz7AsWbQmMGq8/0gzbM/JJsncWTvUECIFqhFA+8HEVtrcTf3gJsHAtSkGbWTdE14LTnvsxTdTUt0/Yyre7IykhxCkvIHrz7rRVdHKaCNFVs8yenFKHVNElphGSviFgV2pRYUSRtYgiQ+KYVN0wVgRPKvZjlr2E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Avd80ZSk; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Avd80ZSk" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c9e607d81fcso1249169a12.2 for ; Mon, 10 Aug 2026 10:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786381856; x=1786986656; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=JhsqyhzE48bljLLTr+dFhyiqwriY9sOBMtlHTtICd3s=; b=Avd80ZSkOicBcGVtsD7BWjbpvUVp7NwN6QlSYiW6CREUAFYkKlqLm5aiiYUI7208fs Bf22+zgU+p/3MuzcRv8pHoTwF66dX1vaZPzP3EYe2fzRCB2CbLMW/jatm7LTgpPF6c1n B5TxyLckYSvXZZIGd3wOgsQRSXYbJ0xX+CWOFq0y0pgPzdWYDeV+DuFLqsbK/Oi8DwNN 0gkUKU0s0+0aOKRKe9XIpf71w3Qoq4E1HFzGQYQ5yXTqKpDVsuWMQDdOX89glmxKzLx7 zamE3SNtI0ITKIoNAEpG7jhUUq4yF5wgFi0uUgkaE7QDYbtd7+qgUgUzl0XN12g+0YaS ciQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786381856; x=1786986656; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=JhsqyhzE48bljLLTr+dFhyiqwriY9sOBMtlHTtICd3s=; b=J5Tng2hD1UPk2i94gSeKMZfWjUWMJ1x7OdIPo/ArzUzwmf6dmkHQkp09DrT9awkh/A 2VywUxQbXXSF/LzcnGYK3GiW7r7j/SdP3m/bnsVTHSQQB1m5rtCxwomxjcVZqr8QFU9K 43vx49vm0/IuTASFJcbSGXeJYc1zCg93wq4TDqstuIXCU9MJrEZdKwQhsJya7CFplk+z rhhAcBrMGbDnjMjFBZhP3GlAeqnjTLpua4saQvp+aIB3kd7ox+ES2s/1AsGaT3T5zeb/ PE+44grq0WtvC+AmjyjtDs+sCLK/cmKMRymPmUsQal1TU0IM/nSho+WKg8xHJlnQmTcb hT7w== X-Forwarded-Encrypted: i=1; AHgh+RpngOX5vpO9bfp0gOHMRyKZUhbblRS6DpdAGWYpl/YlYejx+z0NlgC8NLP7O2kf6TCJJP52r1goPjlzIyM=@vger.kernel.org X-Gm-Message-State: AOJu0YzWu47/gSNYKXgMiqREcNyz3tmXqiwUsaGZ8JYDki91qVSHxGnc cf3GA8Eb/6WvLK3Uf8ohfirQFJvs0fb31+57ZUFdgEeFnDQBgJaP/kfv X-Gm-Gg: AR+sD11F9zshiZ1BgyzMOF6tQi2JmXDc6CTVWnJNtSPoVpMMIfzhr0bRygK3sXb1LrE xj2kUpHBWIEpZBhF632i0a6MoJsp1Xex4E63rRtapZrEDIwxY6oG+gcR83ayMVCqiEGWEw7Uxv3 gw2LSJJNn5zI6mRdusucUW7nAqNvFSPP17kflk57H3rOv/9cUfKBfqE5dp9IADSyci2FAAy/XzA MT1qCVq1KyHi7ZAGoRz+TsaQFiZhKWdT+da0a5TzhwMP1/UrRzxh3wbowAIln/iTNS2IuglUKEf Cr5DdA1ZARS7LVixBDVUHi0b71yzcPR53IU0GqTcqfzcVf1LytNyVGmd7OfS83UWohNkXJE3woY hQIoHqkGqDFVaxR4Tla2vCehmE0hZjIRZke+ITRQxbzguZm7vHmtrnPZBgoyzH1Mbw5Hd8qVlns gKIDEEssiKWmVX9tckAHTVF0Y0riooQZANjcXkuRrEQjIz4QXlo4AaNX/CsVDBlg== X-Received: by 2002:a05:6a20:7344:b0:3b4:5ff3:45cb with SMTP id adf61e73a8af0-3cbada660a2mr33795635637.8.1786381856114; Mon, 10 Aug 2026 10:10:56 -0700 (PDT) Received: from phi.nguyendp ([116.86.160.247]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1410199cf49sm37194663c88.3.2026.08.10.10.10.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 10:10:55 -0700 (PDT) From: Nguyen Dinh Phi To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Dmitry Torokhov , Andy King , George Zhang Cc: Nguyen Dinh Phi , Wupeng Ma , virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 3/3] vsock: use sock_error() to consume sk_err after a failed connect Date: Tue, 11 Aug 2026 01:09:32 +0800 Message-ID: <20260810170935.2242314-4-phind.uet@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260810170935.2242314-1-phind.uet@gmail.com> References: <20260810170935.2242314-1-phind.uet@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Nguyen Dinh Phi --- 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 b59890bbd217..1a287719f24a 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1842,12 +1842,10 @@ static int vsock_connect(struct socket *sock, struct sockaddr_unsized *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