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 D2EE2C433F5 for ; Fri, 4 Mar 2022 05:00:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230306AbiCDFB0 (ORCPT ); Fri, 4 Mar 2022 00:01:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230001AbiCDFBZ (ORCPT ); Fri, 4 Mar 2022 00:01:25 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1CDDD13CEC7 for ; Thu, 3 Mar 2022 21:00:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646370034; 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: in-reply-to:in-reply-to:references:references; bh=C9LljTggMYdd47/c+/HB8RDqC/7m392I60YkhURxrMM=; b=hHPI7M39yzAxEydMz78VDJPVJDyFFx4/fd7iwerMEC1zDS5J7Vo6BmvhF10Irgl9iHxK5a duBWoh7fsQ6HsyM7Owxfttr4CA6RUV0VOWCIuyq0RucGJ/QBdbsHbmFP/2P1zphRKl6Uny 6JaE9iw76ais/8ta3VZ+vfi5Fe71stA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-168-kjRvweTkMGStR67bOl8HpQ-1; Fri, 04 Mar 2022 00:00:32 -0500 X-MC-Unique: kjRvweTkMGStR67bOl8HpQ-1 Received: by mail-wr1-f72.google.com with SMTP id a11-20020adffb8b000000b001efe754a488so2921902wrr.13 for ; Thu, 03 Mar 2022 21:00:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=C9LljTggMYdd47/c+/HB8RDqC/7m392I60YkhURxrMM=; b=2UQZ9HWDkh6+4GgCFNieasBGDXlgTEqmBdsTxGSKpBZeKba909cGGVn6NYrTVjacvC iVEGf+k68A+eZy11m7fq+nmslyiIZeNeznwnSd3/VI+zafRtt+k/KceRsaVYWLJ9BN0o mo2s/El+9TOWFSZrZcvPhWXvVR7xvFh1XNIQ/W57o1LUaY1EJEHMSwt/l6TKLQhsue8Z zr+WdC1IE57zhain7hnIXlL0rvg61FFhjbT0Ts+qF95ETcd+lvYa83MZyXZ6g1HmpBpB kIgN4B82ysaIccAFXrsom7D7gEk+AokF/dnN6em1gAsb7gHg0z8M+0uOYvjdQmsa4j4F xJzw== X-Gm-Message-State: AOAM5336uc/L0Ijs+FfNRQZoDcPk8zzsjYUz63In9mP/W7V/nwcfeH1o ZihK0GGRilxP1GrbAMxQpjEY7Zg2mDPyFJKHzzKRqmszZxrwRNdY5WAtdlj5wArjF/rEVWXBzWu 8Hgfb1g6oQWF/wTaH X-Received: by 2002:a5d:47c5:0:b0:1ef:f2e8:11fc with SMTP id o5-20020a5d47c5000000b001eff2e811fcmr14057951wrc.109.1646370030410; Thu, 03 Mar 2022 21:00:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/9IpbklvBlJJPYjzIkhqrW9cqHaZPxp5pYripZTV4jzY3k3rJRGhRMUtTqLp99H9+2vfm0A== X-Received: by 2002:a5d:47c5:0:b0:1ef:f2e8:11fc with SMTP id o5-20020a5d47c5000000b001eff2e811fcmr14057937wrc.109.1646370030110; Thu, 03 Mar 2022 21:00:30 -0800 (PST) Received: from redhat.com ([2.53.6.39]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c4f8400b00380e45cd564sm4015646wmq.8.2022.03.03.21.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 21:00:29 -0800 (PST) Date: Fri, 4 Mar 2022 00:00:25 -0500 From: "Michael S. Tsirkin" To: Lee Jones Cc: jasowang@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, stable@vger.kernel.org, syzbot+adc3cb32385586bec859@syzkaller.appspotmail.com Subject: Re: [PATCH 1/1] vhost: Protect the virtqueue from being cleared whilst still in use Message-ID: <20220303235937-mutt-send-email-mst@kernel.org> References: <20220302075421.2131221-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220302075421.2131221-1-lee.jones@linaro.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, Mar 02, 2022 at 07:54:21AM +0000, Lee Jones wrote: > vhost_vsock_handle_tx_kick() already holds the mutex during its call > to vhost_get_vq_desc(). All we have to do is take the same lock > during virtqueue clean-up and we mitigate the reported issues. > > Link: https://syzkaller.appspot.com/bug?extid=279432d30d825e63ba00 > > Cc: > Reported-by: syzbot+adc3cb32385586bec859@syzkaller.appspotmail.com > Signed-off-by: Lee Jones So combine with the warning patch and update description with the comment I posted, explaining it's more a just in case thing. > --- > drivers/vhost/vhost.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index 59edb5a1ffe28..bbaff6a5e21b8 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -693,6 +693,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev) > int i; > > for (i = 0; i < dev->nvqs; ++i) { > + mutex_lock(&dev->vqs[i]->mutex); > if (dev->vqs[i]->error_ctx) > eventfd_ctx_put(dev->vqs[i]->error_ctx); > if (dev->vqs[i]->kick) > @@ -700,6 +701,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev) > if (dev->vqs[i]->call_ctx.ctx) > eventfd_ctx_put(dev->vqs[i]->call_ctx.ctx); > vhost_vq_reset(dev, dev->vqs[i]); > + mutex_unlock(&dev->vqs[i]->mutex); > } > vhost_dev_free_iovecs(dev); > if (dev->log_ctx) > -- > 2.35.1.574.g5d30c73bfb-goog