virCapabilitiesInitCaches: Don't leak cache dir

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak cache dir

Michal Privoznik posted 1 patch 6 years, 11 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/2cce9b07845e12bf42eed05ab068c4f8d3826576.1495447733.git.mprivozn@redhat.com

src/conf/capabilities.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak cache dir

Posted by Michal Privoznik 6 years, 11 months ago

To every virDirOpen we must have VIR_DIR_CLOSE otherwise FD is
leaked.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/capabilities.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index d699b0817..a91a72a35 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1555,6 +1555,8 @@ virCapabilitiesInitCaches(virCapsPtr caps)
         if (virAsprintf(&path, "%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos) < 0)
             goto cleanup;
 
+        VIR_DIR_CLOSE(dirp);
+
         rv = virDirOpenIfExists(&dirp, path);
         if (rv < 0)
             goto cleanup;
@@ -1639,7 +1641,7 @@ virCapabilitiesInitCaches(virCapsPtr caps)
  cleanup:
     VIR_FREE(type);
     VIR_FREE(path);
-    virDirClose(&dirp);
+    VIR_DIR_CLOSE(dirp);
     virCapsHostCacheBankFree(bank);
     return ret;
 }
-- 
2.13.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak cache dir

Posted by Pavel Hrdina 6 years, 11 months ago

On Mon, May 22, 2017 at 12:08:53PM +0200, Michal Privoznik wrote:
> To every virDirOpen we must have VIR_DIR_CLOSE otherwise FD is
> leaked.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/conf/capabilities.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list