Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200909154120.363209-1-liq3ea@163.com>
In-Reply-To: <20200909154120.363209-1-liq3ea@163.com>
From:   Li Qiang <liq3ea@gmail.com>
Date:   Fri, 18 Sep 2020 20:58:37 +0800
Message-ID: <CAKXe6SKAFqOQtxbLwA4WA8aEBB-8EtEPvrpsNYU8rLUt9t6zSQ@mail.gmail.com>
Subject: Re: [PATCH] vhost-vdpa: fix memory leak in error path
To:     Li Qiang <liq3ea@163.com>
Cc:     "Michael S. Tsirkin" <mst@redhat.com>,
        Jason Wang <jasowang@redhat.com>,
        kvm list <kvm@vger.kernel.org>,
        virtualization@lists.linux-foundation.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Any status update?

Thanks,
Li Qiang

Li Qiang <liq3ea@163.com> =E4=BA=8E2020=E5=B9=B49=E6=9C=889=E6=97=A5=E5=91=
=A8=E4=B8=89 =E4=B8=8B=E5=8D=8811:42=E5=86=99=E9=81=93=EF=BC=9A
>
> Free the 'page_list' when the 'npages' is zero.
>
> Signed-off-by: Li Qiang <liq3ea@163.com>
> ---
>  drivers/vhost/vdpa.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
> index 3fab94f88894..6a9fcaf1831d 100644
> --- a/drivers/vhost/vdpa.c
> +++ b/drivers/vhost/vdpa.c
> @@ -609,8 +609,10 @@ static int vhost_vdpa_process_iotlb_update(struct vh=
ost_vdpa *v,
>                 gup_flags |=3D FOLL_WRITE;
>
>         npages =3D PAGE_ALIGN(msg->size + (iova & ~PAGE_MASK)) >> PAGE_SH=
IFT;
> -       if (!npages)
> -               return -EINVAL;
> +       if (!npages) {
> +               ret =3D -EINVAL;
> +               goto free_page;
> +       }
>
>         mmap_read_lock(dev->mm);
>
> @@ -666,6 +668,8 @@ static int vhost_vdpa_process_iotlb_update(struct vho=
st_vdpa *v,
>                 atomic64_sub(npages, &dev->mm->pinned_vm);
>         }
>         mmap_read_unlock(dev->mm);
> +
> +free_page:
>         free_page((unsigned long)page_list);
>         return ret;
>  }
> --
> 2.25.1
>