pvrdma: release device resources in case of an error

[Qemu-devel] [PATCH] pvrdma: release device resources in case of an error

P J P posted 1 patch 6 years, 10 months ago

Download mbox

Test asan passed

Test checkpatch passed

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Test docker-clang@ubuntu passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181212175817.815-1-ppandit@redhat.com

hw/rdma/vmw/pvrdma_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] pvrdma: release device resources in case of an error

Posted by P J P 6 years, 10 months ago

From: Prasad J Pandit <pjp@fedoraproject.org>

If during pvrdma device initialisation an error occurs,
pvrdma_realize() does not release memory resources, leading
to memory leakage.

Reported-by: Li Qiang <liq3ea@163.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
 hw/rdma/vmw/pvrdma_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index 8a03ab4669..b65f8662df 100644
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -579,7 +579,7 @@ static void pvrdma_shutdown_notifier(Notifier *n, void *opaque)
 
 static void pvrdma_realize(PCIDevice *pdev, Error **errp)
 {
-    int rc;
+    int rc = 0;
     PVRDMADev *dev = PVRDMA_DEV(pdev);
     Object *memdev_root;
     bool ram_shared = false;
@@ -655,6 +655,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)
 
 out:
     if (rc) {
+        pvrdma_fini(pdev);
         error_append_hint(errp, "Device fail to load\n");
     }
 }
-- 
2.19.2

Re: [Qemu-devel] [PATCH] pvrdma: release device resources in case of an error

Posted by Yuval Shaia 6 years, 10 months ago

On Wed, Dec 12, 2018 at 11:28:17PM +0530, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
> 
> If during pvrdma device initialisation an error occurs,
> pvrdma_realize() does not release memory resources, leading
> to memory leakage.
> 
> Reported-by: Li Qiang <liq3ea@163.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
>  hw/rdma/vmw/pvrdma_main.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
> index 8a03ab4669..b65f8662df 100644
> --- a/hw/rdma/vmw/pvrdma_main.c
> +++ b/hw/rdma/vmw/pvrdma_main.c
> @@ -579,7 +579,7 @@ static void pvrdma_shutdown_notifier(Notifier *n, void *opaque)
>  
>  static void pvrdma_realize(PCIDevice *pdev, Error **errp)
>  {
> -    int rc;
> +    int rc = 0;
>      PVRDMADev *dev = PVRDMA_DEV(pdev);
>      Object *memdev_root;
>      bool ram_shared = false;
> @@ -655,6 +655,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)
>  
>  out:
>      if (rc) {
> +        pvrdma_fini(pdev);
>          error_append_hint(errp, "Device fail to load\n");
>      }

Thanks.

Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>

>  }
> -- 
> 2.19.2
>