MIME-Version: 1.0
References: <20220106083123.4064853-1-xianting.tian@linux.alibaba.com>
In-Reply-To: <20220106083123.4064853-1-xianting.tian@linux.alibaba.com>
From:   Jason Wang <jasowang@redhat.com>
Date:   Fri, 7 Jan 2022 10:34:06 +0800
Message-ID: <CACGkMEuW5po+v-fFPNH6wtVVXD84Bx0UWhe86sHFYXQM39OKRA@mail.gmail.com>
Subject: Re: [PATCH] virtio-pci: fix memory leak of vp_dev
To:     Xianting Tian <xianting.tian@linux.alibaba.com>
Cc:     mst <mst@redhat.com>,
        virtualization <virtualization@lists.linux-foundation.org>,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Jan 6, 2022 at 4:31 PM Xianting Tian
<xianting.tian@linux.alibaba.com> wrote:
>
> In virtio_pci_probe(), vp_dev will not be freed if it goes to
> "err_register" branch. fix it
>
> Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>

So we had this:

commit 33635bd976fb4c3ccf0cfbb81a8d29bb87760607
Author: weiping zhang <zhangweiping@didichuxing.com>
Date:   Thu Dec 21 20:40:24 2017 +0800

    virtio_pci: don't kfree device on register failure

    As mentioned at drivers/base/core.c:
    /*
     * NOTE: _Never_ directly free @dev after calling this function, even
     * if it returned an error! Always use put_device() to give up the
     * reference initialized in this function instead.
     */
    so we don't free vp_dev until vp_dev->vdev.dev.release be called.

    Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
    Reviewed-by: Cornelia Huck <cohuck@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Any reason that the above fix is wrong?

Thanks

> ---
>  drivers/virtio/virtio_pci_common.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
> index fdbde1db5..48b5ac15e 100644
> --- a/drivers/virtio/virtio_pci_common.c
> +++ b/drivers/virtio/virtio_pci_common.c
> @@ -602,8 +602,7 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
>  err_enable_device:
>         if (reg_dev)
>                 put_device(&vp_dev->vdev.dev);
> -       else
> -               kfree(vp_dev);
> +       kfree(vp_dev);
>         return rc;
>  }
>
> --
> 2.17.1
>