Re: [PATCH] vhost-vdpa: fix memory leak in error path

[Tianjia Zhang]

LGTM.

Reviewed-by: Tianjia Zhang 

Thanks.

On 9/9/20 11:41 PM, Li Qiang wrote:

Free the 'page_list' when the 'npages' is zero.

Signed-off-by: Li Qiang 
---
  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 
vhost_vdpa *v,
gup_flags |= FOLL_WRITE;
  
  	npages = PAGE_ALIGN(msg->size + (iova & ~PAGE_MASK)) >> PAGE_SHIFT;

-   if (!npages)
-   return -EINVAL;
+   if (!npages) {
+   ret = -EINVAL;
+   goto free_page;
+   }
  
  	mmap_read_lock(dev->mm);
  
@@ -666,6 +668,8 @@ static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v,

atomic64_sub(npages, >mm->pinned_vm);
}
mmap_read_unlock(dev->mm);
+
+free_page:
free_page((unsigned long)page_list);
return ret;
  }

Re: [PATCH] vhost-vdpa: fix memory leak in error path

[Li Qiang]

Any status update?

Thanks,
Li Qiang

Li Qiang  于2020年9月9日周三 下午11:42写道：
>
> Free the 'page_list' when the 'npages' is zero.
>
> Signed-off-by: Li Qiang 
> ---
>  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 
> vhost_vdpa *v,
> gup_flags |= FOLL_WRITE;
>
> npages = PAGE_ALIGN(msg->size + (iova & ~PAGE_MASK)) >> PAGE_SHIFT;
> -   if (!npages)
> -   return -EINVAL;
> +   if (!npages) {
> +   ret = -EINVAL;
> +   goto free_page;
> +   }
>
> mmap_read_lock(dev->mm);
>
> @@ -666,6 +668,8 @@ static int vhost_vdpa_process_iotlb_update(struct 
> vhost_vdpa *v,
> atomic64_sub(npages, >mm->pinned_vm);
> }
> mmap_read_unlock(dev->mm);
> +
> +free_page:
> free_page((unsigned long)page_list);
> return ret;
>  }
> --
> 2.25.1
>

Re: [PATCH] vhost-vdpa: fix memory leak in error path

[Jason Wang]

On 2020/9/9 下午11:41, Li Qiang wrote:

Free the 'page_list' when the 'npages' is zero.

Signed-off-by: Li Qiang 
---
  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 
vhost_vdpa *v,
gup_flags |= FOLL_WRITE;
  
  	npages = PAGE_ALIGN(msg->size + (iova & ~PAGE_MASK)) >> PAGE_SHIFT;

-   if (!npages)
-   return -EINVAL;
+   if (!npages) {
+   ret = -EINVAL;
+   goto free_page;
+   }
  
  	mmap_read_lock(dev->mm);
  
@@ -666,6 +668,8 @@ static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v,

atomic64_sub(npages, >mm->pinned_vm);
}
mmap_read_unlock(dev->mm);
+
+free_page:
free_page((unsigned long)page_list);
return ret;
  }



Cc: sta...@vger.kernel.org

Acked-by: Jason Wang 

[PATCH] vhost-vdpa: fix memory leak in error path

[Li Qiang]

Free the 'page_list' when the 'npages' is zero.

Signed-off-by: Li Qiang 
---
 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 
vhost_vdpa *v,
gup_flags |= FOLL_WRITE;
 
npages = PAGE_ALIGN(msg->size + (iova & ~PAGE_MASK)) >> PAGE_SHIFT;
-   if (!npages)
-   return -EINVAL;
+   if (!npages) {
+   ret = -EINVAL;
+   goto free_page;
+   }
 
mmap_read_lock(dev->mm);
 
@@ -666,6 +668,8 @@ static int vhost_vdpa_process_iotlb_update(struct 
vhost_vdpa *v,
atomic64_sub(npages, >mm->pinned_vm);
}
mmap_read_unlock(dev->mm);
+
+free_page:
free_page((unsigned long)page_list);
return ret;
 }
-- 
2.25.1