Thread (4 messages) 4 messages, 4 authors, 2020-09-18

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

From: Li Qiang <hidden>
Date: 2020-09-18 12:59:16
Also in: kvm, lkml

Any status update?

Thanks,
Li Qiang

Li Qiang [off-list ref] 于2020年9月9日周三 下午11:42写道:
quoted hunk ↗ jump to hunk
Free the 'page_list' when the 'npages' is zero.

Signed-off-by: Li Qiang <redacted>
---
 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, &dev->mm->pinned_vm);
        }
        mmap_read_unlock(dev->mm);
+
+free_page:
        free_page((unsigned long)page_list);
        return ret;
 }
--
2.25.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help