From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1C89CDB47E for ; Thu, 19 Oct 2023 00:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231341AbjJSAVg (ORCPT ); Wed, 18 Oct 2023 20:21:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbjJSAVf (ORCPT ); Wed, 18 Oct 2023 20:21:35 -0400 X-Greylist: delayed 532 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 18 Oct 2023 17:21:33 PDT Received: from out-208.mta1.migadu.com (out-208.mta1.migadu.com [95.215.58.208]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFBE8FE for ; Wed, 18 Oct 2023 17:21:33 -0700 (PDT) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697674360; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eiFGcXBir5895gbTnSvVkUAxBA2ZOAi3wV+AILiCiwU=; b=gYDHfis9ygwRm6l48oBXXssrXFtLKWBA7IorJAjoGE8Y7cjSK3C6oXw0KLLLCpy6zE4dCc ZDd5n0hHsdxcVwqeXXZddcG8WfkDBsqheECQ//wETBy+XTwaaYas4ig9BUhzqjjEnFnkgT OsgHmHHIzL+WgaterzAipWgib/DnH2Y= Date: Thu, 19 Oct 2023 01:12:34 +0100 MIME-Version: 1.0 Subject: Re: [PATCH] vsock: initialize the_virtio_vsock before using VQs Content-Language: en-US To: Alexandru Matei , Stefan Hajnoczi , Stefano Garzarella , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mihai Petrisor , Viorel Canja References: <20231018183247.1827-1-alexandru.matei@uipath.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Vadim Fedorenko In-Reply-To: <20231018183247.1827-1-alexandru.matei@uipath.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 18/10/2023 19:32, Alexandru Matei wrote: > 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 > --- > net/vmw_vsock/virtio_transport.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c > index e95df847176b..eae0867133f8 100644 > --- a/net/vmw_vsock/virtio_transport.c > +++ b/net/vmw_vsock/virtio_transport.c > @@ -658,12 +658,13 @@ static int virtio_vsock_probe(struct virtio_device *vdev) > vsock->seqpacket_allow = true; > > vdev->priv = vsock; > + rcu_assign_pointer(the_virtio_vsock, vsock); > > ret = virtio_vsock_vqs_init(vsock); > - if (ret < 0) > + if (ret < 0) { > + rcu_assign_pointer(the_virtio_vsock, NULL); > goto out; > - > - rcu_assign_pointer(the_virtio_vsock, vsock); > + } > > mutex_unlock(&the_virtio_vsock_mutex); > Looks like virtio_vsock_restore() needs the same changes. But virtio_vsock_vqs_init() can fail only in virtio_find_vqs(). Maybe it can be split into 2 functions to avoid second rcu_assign_pointer() in case of error?