diff options
| author | Stefan Weil <sw@weilnetz.de> | 2013-06-10 22:36:22 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-06-11 23:45:44 +0400 |
| commit | c5633d998a27502ad8cc10c2d46f91b02555ae7a (patch) | |
| tree | 90d53eb52bd7fcf6965be534c43ba1aca464c3e0 | |
| parent | 1e2a1d41f29adc8ae3013612c5a0114a87773773 (diff) | |
hw/xen: Use g_free instead of free and fix potential memory leaks
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>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/xen/xen_pt_config_init.c | 4 | ||||
| -rw-r--r-- | 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 01872db5b7..8ccc2e4b9c 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 */ @@ -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; } |