Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
From:   Alexandru Matei <alexandru.matei@uipath.com>
To:     Stefan Hajnoczi <stefanha@redhat.com>,
        Stefano Garzarella <sgarzare@redhat.com>,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alexandru Matei <alexandru.matei@uipath.com>,
        Mihai Petrisor <mihai.petrisor@uipath.com>,
        Viorel Canja <viorel.canja@uipath.com>
Subject: [PATCH v2] vsock/virtio: initialize the_virtio_vsock before using VQs
Date:   Mon, 23 Oct 2023 17:08:33 +0300
Message-Id: <20231023140833.11206-1-alexandru.matei@uipath.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jCNMNN38FvmV9z5y+ztUsw9ecYa1hSo+zgwyvZR/J8X0ilsBtRFqxCR6Njka?=
 =?us-ascii?Q?Kgkqmf8R1BAel6o9qVeJPignnpTByko2NeSQX3IHxFSoupZHTsB9fR0SDY4Q?=
 =?us-ascii?Q?75rbFIv20xwfB4xdHRU86rbDmi5Di43meYrfANOiEKdq7TKAUbFsn8DwIFxC?=
 =?us-ascii?Q?57Gcd1tyhacf/ihvN7UvjD1usINFbKZ7Ak8rrT187FzTB0DSojpjsPjl4yYV?=
 =?us-ascii?Q?sJ1m20byiM6ByT3zkYAy7ZRJUZCnBzvThGP7TGCd95utqje6mEc9kAiBCN5r?=
 =?us-ascii?Q?S1/qJ5dBOqdqNdCy+JfvusBdkiTMpQkAgbkuRPjzlHqC1HV9GhkmSM4J0KIx?=
 =?us-ascii?Q?m+yfhVE1pk2wbL8NG8Es5p9Cm8GVyuFqH1Kbmjj943NZwSuYeEEgrLN8uWHh?=
 =?us-ascii?Q?2+7la99BWmmWYmaJRd5epT4eIWU2B49b+xQPCUtOsDiBjPwJW6KcB/T4cvdg?=
 =?us-ascii?Q?r01IE8cKNBKNHHkyuH9m827BuB37Nq+MYA+j2SAEP17OhLY4hHjuWptdCHLV?=
 =?us-ascii?Q?WPfKgNFsYGkFh0OZjhXaKbFwSghNLjdKdezM21G9wSdj3PZpkO6fRSlUYoa5?=
 =?us-ascii?Q?QjY3b8JWTpEZAZcTh4Y9u8+ib/IbTLGKyX8s5wbZDoECohCDp2A5mt9f2jES?=
 =?us-ascii?Q?uhWIh5daR63lCR1RnOqv9X0lMxpT/roSpdGSxrHNJLfNCusDU4V4HGjIYJHm?=
 =?us-ascii?Q?zEqR+NzAKbkLR/pR/inQB5cJLJmMfek38uXfR6zEAkay0pDLcN/BDaqaIL23?=
 =?us-ascii?Q?RaGB5hu6/L9BCklwGKcimfvxPCFIne391RWVMJCeewkutGOe8YOfjgbkRSTV?=
 =?us-ascii?Q?37TfnzzUkVajV2D4vjnd7drxvqIXesFRtWbtVI5CgRzbxdWt1RN8zPZA2ayg?=
 =?us-ascii?Q?wLndfEIPLi+hTr39Pv3LGtaAH3WWNRNICI/WYvB/o5Dk6i1yw970LbnB2ll1?=
 =?us-ascii?Q?BfQ+r/cWe53QPDy8Xe6aZ7ZheIyeaBGKKCYO4zCkFLET088BqKWPWw2AQWpP?=
 =?us-ascii?Q?9XI3EBwGNUNlgeIDKjxgCxRxDwVY2kotIHudAdrWOBO0Mpf0zFxND+AyzSmW?=
 =?us-ascii?Q?HbhiCWxQVyaBQ94hO0pvDjKvRW24n5fTTXTYb3sx8E3xpV6LAPM1yMHNYOX3?=
 =?us-ascii?Q?2Aga0oL2AolLa5+LinC7iaNLqhJBL6GSJlQLN56sYt9DbVBhzngT5Tb9D1Ir?=
 =?us-ascii?Q?C8l4D94D67Mxf01Z/jTVan/ZlRD5jxTNLZDCMQgSD01hFbUxkK0c0GW3fKhl?=
 =?us-ascii?Q?mB8nMiBlnnEM/u6Pi8bQ6etWrdb5frPMfYtGxHF0MWPNeWkrMrRpFGsqJ8qb?=
 =?us-ascii?Q?40onkB10tdsOTXKKrIYzd8eZMbG7f0y+DgLBVtf/WN4REmahDhLTqjj0gF/w?=
 =?us-ascii?Q?XaHmoDcO+nTFWFZH10TQ51GaWdYKMo4OtI82u3IU2y83sXnaSV/bU5mNrfuU?=
 =?us-ascii?Q?tpZJ6g684SYdlIpWJ+KiRI4tEpXEWtnAPgp1qGnPJ6KKSrop5BCapC6PD4IV?=
 =?us-ascii?Q?dr1qz4tZh0z1f7P5/w6mAIW6tgKalYVBl7OOMiURWyCcILejGRb2u5X4PNSD?=
 =?us-ascii?Q?ecRlzY+efcwLdapcsAoYdIwc/6YLWBsYUXgwT/SqH+NSPHny/lfdVvyEQNsS?=
 =?us-ascii?Q?ng=3D=3D?=
X-OriginatorOrg: uipath.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d1965bbc-2952-425b-4e2c-08dbd3d1a082
X-MS-Exchange-CrossTenant-AuthSource: VI1PR02MB4527.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2023 14:09:09.9367
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: d8353d2a-b153-4d17-8827-902c51f72357
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mY6Lx/KB8kGkclcjp4rheoAqTTEiQBj/mEBH85sVqc+DeIxtWK9CSwQEtxAF+TNklZKHo38Nw2oFhsz5Q/nbfgwfW+uqKvfVIle3rTaOt3w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR02MB6460
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 23 Oct 2023 07:09:29 -0700 (PDT)

Once VQs are filled with empty buffers and we kick the host,
it can send connection requests.  If 'the_virtio_vsock' is not
initialized before, replies are silently dropped and do not reach the host.

Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock")
Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com>
---
v2: 
- split virtio_vsock_vqs_init in vqs_init and vqs_fill and moved 
  the_virtio_vsock initialization after vqs_init

 net/vmw_vsock/virtio_transport.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index e95df847176b..92738d1697c1 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -559,6 +559,11 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
 	vsock->tx_run = true;
 	mutex_unlock(&vsock->tx_lock);
 
+	return 0;
+}
+
+static void virtio_vsock_vqs_fill(struct virtio_vsock *vsock)
+{
 	mutex_lock(&vsock->rx_lock);
 	virtio_vsock_rx_fill(vsock);
 	vsock->rx_run = true;
@@ -568,8 +573,6 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
 	virtio_vsock_event_fill(vsock);
 	vsock->event_run = true;
 	mutex_unlock(&vsock->event_lock);
-
-	return 0;
 }
 
 static void virtio_vsock_vqs_del(struct virtio_vsock *vsock)
@@ -664,6 +667,7 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
 		goto out;
 
 	rcu_assign_pointer(the_virtio_vsock, vsock);
+	virtio_vsock_vqs_fill(vsock);
 
 	mutex_unlock(&the_virtio_vsock_mutex);
 
@@ -736,6 +740,7 @@ static int virtio_vsock_restore(struct virtio_device *vdev)
 		goto out;
 
 	rcu_assign_pointer(the_virtio_vsock, vsock);
+	virtio_vsock_vqs_fill(vsock);
 
 out:
 	mutex_unlock(&the_virtio_vsock_mutex);
-- 
2.34.1