[Qemu-devel] [PATCH] hw/xen: Use g_free instead of free and fix potential memory leaks

[Qemu-devel] [PATCH] hw/xen: Use g_free instead of free and fix potential memory leaks

[Stefan Weil]

The wrong functions and the missing calls of g_free were reported
by cppcheck.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/xen/xen_pt_config_init.c |    4 ++--
 xen-all.c                   |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 01872db..8ccc2e4 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -1777,12 +1777,12 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s,
         rc = reg->init(s, reg_entry->reg,
                        reg_grp->base_offset + reg->offset, &data);
         if (rc < 0) {
-            free(reg_entry);
+            g_free(reg_entry);
             return rc;
         }
         if (data == XEN_PT_INVALID_REG) {
             /* free unused BAR register entry */
-            free(reg_entry);
+            g_free(reg_entry);
             return 0;
         }
         /* set register value */
diff --git a/xen-all.c b/xen-all.c
index bc105f1..1a1d7bb 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -389,7 +389,7 @@ static int xen_remove_from_physmap(XenIOState *state,
     if (state->log_for_dirtybit == physmap) {
         state->log_for_dirtybit = NULL;
     }
-    free(physmap);
+    g_free(physmap);
 
     return 0;
 }
@@ -1030,7 +1030,7 @@ static void xen_read_physmap(XenIOState *state)
                 xen_domid, entries[i]);
         value = xs_read(state->xenstore, 0, path, &len);
         if (value == NULL) {
-            free(physmap);
+            g_free(physmap);
             continue;
         }
         physmap->start_addr = strtoull(value, NULL, 16);
@@ -1041,7 +1041,7 @@ static void xen_read_physmap(XenIOState *state)
                 xen_domid, entries[i]);
         value = xs_read(state->xenstore, 0, path, &len);
         if (value == NULL) {
-            free(physmap);
+            g_free(physmap);
             continue;
         }
         physmap->size = strtoull(value, NULL, 16);
@@ -1069,12 +1069,14 @@ int xen_hvm_init(void)
     state->xce_handle = xen_xc_evtchn_open(NULL, 0);
     if (state->xce_handle == XC_HANDLER_INITIAL_VALUE) {
         perror("xen: event channel open");
+        g_free(state);
         return -errno;
     }
 
     state->xenstore = xs_daemon_open();
     if (state->xenstore == NULL) {
         perror("xen: xenstore open");
+        g_free(state);
         return -errno;
     }
 
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] hw/xen: Use g_free instead of free and fix potential memory leaks

[Stefano Stabellini]

On Mon, 10 Jun 2013, Stefan Weil wrote:
> The wrong functions and the missing calls of g_free were reported
> by cppcheck.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Are you happy to get this patch upstream via qemu-trivial? Or do you
want me to pick it up?


>  hw/xen/xen_pt_config_init.c |    4 ++--
>  xen-all.c                   |    8 +++++---
>  2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
> index 01872db..8ccc2e4 100644
> --- a/hw/xen/xen_pt_config_init.c
> +++ b/hw/xen/xen_pt_config_init.c
> @@ -1777,12 +1777,12 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s,
>          rc = reg->init(s, reg_entry->reg,
>                         reg_grp->base_offset + reg->offset, &data);
>          if (rc < 0) {
> -            free(reg_entry);
> +            g_free(reg_entry);
>              return rc;
>          }
>          if (data == XEN_PT_INVALID_REG) {
>              /* free unused BAR register entry */
> -            free(reg_entry);
> +            g_free(reg_entry);
>              return 0;
>          }
>          /* set register value */
> diff --git a/xen-all.c b/xen-all.c
> index bc105f1..1a1d7bb 100644
> --- a/xen-all.c
> +++ b/xen-all.c
> @@ -389,7 +389,7 @@ static int xen_remove_from_physmap(XenIOState *state,
>      if (state->log_for_dirtybit == physmap) {
>          state->log_for_dirtybit = NULL;
>      }
> -    free(physmap);
> +    g_free(physmap);
>  
>      return 0;
>  }
> @@ -1030,7 +1030,7 @@ static void xen_read_physmap(XenIOState *state)
>                  xen_domid, entries[i]);
>          value = xs_read(state->xenstore, 0, path, &len);
>          if (value == NULL) {
> -            free(physmap);
> +            g_free(physmap);
>              continue;
>          }
>          physmap->start_addr = strtoull(value, NULL, 16);
> @@ -1041,7 +1041,7 @@ static void xen_read_physmap(XenIOState *state)
>                  xen_domid, entries[i]);
>          value = xs_read(state->xenstore, 0, path, &len);
>          if (value == NULL) {
> -            free(physmap);
> +            g_free(physmap);
>              continue;
>          }
>          physmap->size = strtoull(value, NULL, 16);
> @@ -1069,12 +1069,14 @@ int xen_hvm_init(void)
>      state->xce_handle = xen_xc_evtchn_open(NULL, 0);
>      if (state->xce_handle == XC_HANDLER_INITIAL_VALUE) {
>          perror("xen: event channel open");
> +        g_free(state);
>          return -errno;
>      }
>  
>      state->xenstore = xs_daemon_open();
>      if (state->xenstore == NULL) {
>          perror("xen: xenstore open");
> +        g_free(state);
>          return -errno;
>      }
>  
> -- 
> 1.7.10.4
> 

Re: [Qemu-devel] [PATCH] hw/xen: Use g_free instead of free and fix potential memory leaks

[Stefan Weil]

Am 11.06.2013 13:02, schrieb Stefano Stabellini:
> On Mon, 10 Jun 2013, Stefan Weil wrote:
>> The wrong functions and the missing calls of g_free were reported
>> by cppcheck.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>
> Are you happy to get this patch upstream via qemu-trivial? Or do you
> want me to pick it up?

Thank you for the review.

qemu-trivial is fine, and Michael already applied the patch.

Regards
Stefan