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 E28A020B1EF for ; Fri, 10 Jan 2025 08:35:41 +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=1736498143; cv=none; b=puea+BPYsGagpR1V5LRFlcjFfnVPfV6pfJhWqdOWYBaIATyT3OnZGq2RXg+x+zHozEtXSzb55O+c2FF0oQiCFqXWsco7pSRjqiNp3jUwWhTfVqqH1LupTm9GLSTnohJnrUjeJtsKP8Ie3TYGFg+FdH3ttMteNNmPXwHDdUm91JQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736498143; c=relaxed/simple; bh=uPsduUWhdScehzIkWWVjxwh3m7xAtK9UHuNXKkdV3cs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T1nb8QCrVzh1uY01nUPLSdF7sE6j0xYEux65YbHuttjUGfH1l2JYTXhPR5my6FIhlbrZuZNfoyUITHwUibeICEYImtMPE60P4U8fZVyStmK0B4/buYr2TdZXnGy9Wk1GzxgQLqGah9efqNV6Fkpot1Jfr5Gk+15HZuJJFaVgnwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=P1PPdZ99; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="P1PPdZ99" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736498141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i/UxJFQhjZHiTLyDu6i94GmVxCXul14lCOVKyB1E+sY=; b=P1PPdZ99n92Uc8zsuCYTOeZlzGlJxfQS/MdOUwvWN4jZpsSXH4HhxlXpBPMmW1VMV7E7ie WpREVjgCOgbdg8QBx4SnprjyRyKeQChMUrYPUMfKtsyFzGL+gxBUM6fdOnVjlui8GssAdj rLd0OH7bg++sr8DLtp4oSC3aGhjBMIU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-63-gNGTttkTNvGfdZnRqGXRfA-1; Fri, 10 Jan 2025 03:35:40 -0500 X-MC-Unique: gNGTttkTNvGfdZnRqGXRfA-1 X-Mimecast-MFC-AGG-ID: gNGTttkTNvGfdZnRqGXRfA Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4361ac8b25fso9524595e9.2 for ; Fri, 10 Jan 2025 00:35:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736498139; x=1737102939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i/UxJFQhjZHiTLyDu6i94GmVxCXul14lCOVKyB1E+sY=; b=WTyM8cGev+AW2E9RIXbitzUX8ZfZPlE4mggHgMI1vZbMpgnW2McBIqIdFKDSouLz66 R5MboD/9yqgWislJjHlQ8PRR64cB8n4fZke8WqJh7rEpF7MJ96xaCBAf326Bxa2ucZ8t fo++aJBEFrQnCRVwM4EOLwnsikhC3Dv/NCE/YM6H92vqNiwRQNKPEQieOZ47s43iKAfj GDs6Z1qZVqUg9add2SmhJXMAkUmGNzdnhSSU+p4lmg5lbJW7YUB9P+brBK53uEQ78YqY kcS2z8UzN/3RfovBoA1gHC4QZXiubD/nZXLZXCHUHroFT/fdI0ZqiaNHcdGwbPylSV9u o3hA== X-Forwarded-Encrypted: i=1; AJvYcCUS9vJr3nvfiakif+gTYfeP2g6qdEoCTlFjuy8ASOzUbnBPYkPG6vZrOc1LgvrdhK+XWXg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+dcroba+P+f9WEHqgsoJhDooZTC8TZNpdNu+pgP6rdZB+WgNI gyMQvbH92kTQH6X0q1SLtqR81Hqiiirkk6bae6kwWHoaFOyb2COTKr/wM8WxhJ3vvGxN5RvVoYC RfUSbDTzipUJ78Rz/U4tnzD2NRgN0b6Vv0JtvpN7uzJdF3nFPhg== X-Gm-Gg: ASbGnctJOPCQ9Q6KuNWYvZpkXQHludyRlbFPkXRFMkx6mLACxsx5J1adcz/I3B+RUH+ K4SiJ8450wPzEKmwIAHwThkCFgqliFvdCtahEEgNsxVDs0kbPru0hC+1vKDeYQENEdhW1DrCqWK rGqMLd3nY4IwzFx4DKVZ02cxNrPsaFdhIQDtSQ44Acm+84eppdSA4AIprq7rvLn3yFSDyvqGwPB +3/R1FmtLDdpwe5EWnjbUSWldQWK7vOvskmOz7hr6vVZ7c= X-Received: by 2002:adf:ae59:0:b0:38a:88b8:97a9 with SMTP id ffacd0b85a97d-38a88b898b4mr6672307f8f.2.1736498138762; Fri, 10 Jan 2025 00:35:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0wfwdkUAlCHyAfjqywZwwjbDz7xJE+/6M4bU0+8jxnFXT/mEU5AdPqfdlVeWVXgoMTeKpvg== X-Received: by 2002:adf:ae59:0:b0:38a:88b8:97a9 with SMTP id ffacd0b85a97d-38a88b898b4mr6672275f8f.2.1736498138249; Fri, 10 Jan 2025 00:35:38 -0800 (PST) Received: from step1.. ([5.77.78.183]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4b8214sm3895187f8f.78.2025.01.10.00.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 00:35:37 -0800 (PST) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Xuan Zhuo , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Luigi Leonardi , "David S. Miller" , Wongi Lee , Stefano Garzarella , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , "Michael S. Tsirkin" , Eric Dumazet , kvm@vger.kernel.org, Paolo Abeni , Stefan Hajnoczi , Jason Wang , Simon Horman , Hyunwoo Kim , Jakub Kicinski , Michal Luczaj , virtualization@lists.linux.dev, Bobby Eshleman , stable@vger.kernel.org Subject: [PATCH net v2 4/5] vsock: reset socket state when de-assigning the transport Date: Fri, 10 Jan 2025 09:35:10 +0100 Message-ID: <20250110083511.30419-5-sgarzare@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250110083511.30419-1-sgarzare@redhat.com> References: <20250110083511.30419-1-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Transport's release() and destruct() are called when de-assigning the vsock transport. These callbacks can touch some socket state like sock flags, sk_state, and peer_shutdown. Since we are reassigning the socket to a new transport during vsock_connect(), let's reset these fields to have a clean state with the new transport. Fixes: c0cfa2d8a788 ("vsock: add multi-transports support") Cc: stable@vger.kernel.org Signed-off-by: Stefano Garzarella --- net/vmw_vsock/af_vsock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 5cf8109f672a..74d35a871644 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -491,6 +491,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) */ vsk->transport->release(vsk); vsock_deassign_transport(vsk); + + /* transport's release() and destruct() can touch some socket + * state, since we are reassigning the socket to a new transport + * during vsock_connect(), let's reset these fields to have a + * clean state. + */ + sock_reset_flag(sk, SOCK_DONE); + sk->sk_state = TCP_CLOSE; + vsk->peer_shutdown = 0; } /* We increase the module refcnt to prevent the transport unloading -- 2.47.1