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 4F491C433FE for ; Wed, 2 Mar 2022 13:31:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242246AbiCBNbt (ORCPT ); Wed, 2 Mar 2022 08:31:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242237AbiCBNbp (ORCPT ); Wed, 2 Mar 2022 08:31:45 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7B195C558B for ; Wed, 2 Mar 2022 05:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646227861; 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=vpr93uN6MxOxe9fXO/50h3J2w847QD18h7MxHrR4EFI=; b=YvsY4Zo2Oabn2T+5XbAxhrMnCWLD/qmXw8QLOd28bQN4OqoPxuKAiekvRdG4e95O/WGjgu cP887Q1ctYclA/8kZKFuLkEYNhRPtLUdzF0mg+CsoBztlpQ9ZFl+ixrn3ltsrIokEe6b0W A6DGqBpKw8hLzMw6hfnfSNwxmG8yc+o= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-325-64ZZnJuCOCexROZcBGN0pw-1; Wed, 02 Mar 2022 08:30:59 -0500 X-MC-Unique: 64ZZnJuCOCexROZcBGN0pw-1 Received: by mail-wm1-f71.google.com with SMTP id h19-20020a05600c351300b0038141cf26deso806397wmq.8 for ; Wed, 02 Mar 2022 05:30:59 -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=vpr93uN6MxOxe9fXO/50h3J2w847QD18h7MxHrR4EFI=; b=BNz1/soIw/RZhoGpHJnbiXfS1UyUtB5xGnnqR7XHh+qOVTF5m34D3l+OapwhC6GelB qT/6E7BlpyaddCKJ+1SJl0vlUrIs4R5RyqOFexSw+e+vjLLjYpvSgCQ7Kst0Dj5L8t1c r9O7Fm9c1XzFSlVL66zEo85UUeHNgVJe5P0pgbT6Kqf2CNf9zfcKnK+b65pKOeePR1af lPd2z7D7MWqn+BKoJ+KcEVx6d9v7X/j+tBZ1GqGaTBrb6oioVtUPLY6ghXYbGvI6yAy0 9q2NG1eR6cvR4oHHUmHqIPGWt84V2z5CqWzKLOCVonP2OuVXnmfPbBXauo9Kx3j6/Nxx MPQg== X-Gm-Message-State: AOAM531vNYVP72WXfpKcFM7U/Ias+wIxkwwJxBf+p5grKebleqpRHXLt PuW8XBdc5JZLR4+GkTWvCmgyhiI1TIjUiaWn3aC2O3FD5BttQ9VVN9nbV10J/nH3rL8Yj6kCtrM MopEgLPnpCIoM X-Received: by 2002:a5d:4089:0:b0:1f0:4819:61ba with SMTP id o9-20020a5d4089000000b001f0481961bamr706810wrp.307.1646227857898; Wed, 02 Mar 2022 05:30:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyB5w9pGnsT+Lg3Clzc3lJA6rrR//BxxGl8wdCoogL6jR5Pnb1QZrgmJ3q8QCWDn1myvFVNdQ== X-Received: by 2002:a5d:4089:0:b0:1f0:4819:61ba with SMTP id o9-20020a5d4089000000b001f0481961bamr706789wrp.307.1646227857681; Wed, 02 Mar 2022 05:30:57 -0800 (PST) Received: from redhat.com ([2a10:8006:355c:0:48d6:b937:2fb9:b7de]) by smtp.gmail.com with ESMTPSA id bi6-20020a05600c3d8600b00381590dbb25sm9721486wmb.3.2022.03.02.05.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 05:30:56 -0800 (PST) Date: Wed, 2 Mar 2022 08:30:54 -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: <20220302082021-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: kvm@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 > --- > 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); > } So this is a mitigation plan but the bug is still there though we don't know exactly what it is. I would prefer adding something like WARN_ON(mutex_is_locked(vqs[i]->mutex) here - does this make sense? > vhost_dev_free_iovecs(dev); > if (dev->log_ctx) > -- > 2.35.1.574.g5d30c73bfb-goog