The "goto err;" for malloc() error handling would cause the cleanup code
to use 'ptes' before it had been initialised, and causing a build
failure because of -Werror=maybe-uninitialised.
Use "goto err;" consistently for all error handling.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Ian Campbell <ian.campb...@citrix.com>
CC: Ian Jackson <ian.jack...@eu.citrix.com>
CC: Wei Liu <wei.l...@citrix.com>
CC: Juergen Gross <jgr...@suse.com>
---
tools/libxc/xc_sr_save_x86_pv.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c
index 4deb58f..4a29460 100644
--- a/tools/libxc/xc_sr_save_x86_pv.c
+++ b/tools/libxc/xc_sr_save_x86_pv.c
@@ -316,8 +316,8 @@ static int map_p2m_list(struct xc_sr_context *ctx, uint64_t
p2m_cr3)
xc_interface *xch = ctx->xch;
xen_vaddr_t p2m_vaddr, p2m_end, mask, off;
xen_pfn_t p2m_mfn, mfn, saved_mfn, max_pfn;
- uint64_t *ptes;
- xen_pfn_t *mfns;
+ uint64_t *ptes = NULL;
+ xen_pfn_t *mfns = NULL;
unsigned fpp, n_pages, level, shift, idx_start, idx_end, idx, saved_idx;
int rc = -1;
@@ -327,7 +327,7 @@ static int map_p2m_list(struct xc_sr_context *ctx, uint64_t
p2m_cr3)
{
ERROR("Bad p2m_cr3 value %#" PRIx64, p2m_cr3);
errno = ERANGE;
- return -1;
+ goto err;
}
get_p2m_generation(ctx);
@@ -350,7 +350,7 @@ static int map_p2m_list(struct xc_sr_context *ctx, uint64_t
p2m_cr3)
ERROR("Bad virtual p2m address range %#" PRIx64 "-%#" PRIx64,
p2m_vaddr, p2m_end);
errno = ERANGE;
- return -1;
+ goto err;
}
}
else
@@ -363,7 +363,7 @@ static int map_p2m_list(struct xc_sr_context *ctx, uint64_t
p2m_cr3)
ERROR("Bad virtual p2m address range %#" PRIx64 "-%#" PRIx64,
p2m_vaddr, p2m_end);
errno = ERANGE;
- return -1;
+ goto err;
}
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
