vhost-vdpa: fix memory leak in error path
Subsystems (5)
PATCH 1/1 vhost-vdpa: fix memory leak in error path
Free the 'page_list' when the 'npages' is zero.
Signed-off-by Li Qiang <[email protected]>
--- drivers/vhost/vdpa.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/vhost/vdpa.c +6 -2
@@ -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, &dev->mm->pinned_vm); }mmap_read_unlock (dev->mm); + +free_page:free_page ((unsigned long )page_list);return ret; }
Signature · 1 line
2.25.1
Quoted 25 lines · Li Qiang
Free the '
page_list' when the 'npages' is zero.Signed-off-by Li Qiang <[email protected]>--- drivers/vhost/vdpa.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/vhost/vdpa.c +4
-2@@ -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);
drivers/vhost/vdpa.c static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v, · line 675
Quoted 8 lines
drivers/vhost/vdpa.c +2
-0@@ -666,6 +668,8 @@ static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v,atomic64_sub (npages, &dev->mm->pinned_vm); }mmap_read_unlock (dev->mm); + +free_page:free_page ((unsigned long )page_list);return ret; }
Acked-by Jason Wang <[email protected]>
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Any status update?
Thanks,
Li Qiang
Quoted 37 lines · Li Qiang <[email protected]> 于2020年9月9日周三 下午11:42写道:
Free the '
page_list' when the 'npages' is zero.Signed-off-by Li Qiang <[email protected]>--- drivers/vhost/vdpa.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/vhost/vdpa.c +6
-3@@ -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, &dev->mm->pinned_vm); }mmap_read_unlock (dev->mm); + +free_page:free_page ((unsigned long )page_list);return ret; } --2.25.1
LGTM.
Reviewed-by Tianjia Zhang <[email protected]>
Thanks.
Quoted 34 lines · Li Qiang
Free the '
page_list' when the 'npages' is zero.Signed-off-by Li Qiang <[email protected]>--- drivers/vhost/vdpa.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/vhost/vdpa.c +6
-2@@ -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, &dev->mm->pinned_vm); }mmap_read_unlock (dev->mm); + +free_page:free_page ((unsigned long )page_list);return ret; }