aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Daley <mattjd@gmail.com>2013-09-10 22:18:46 +1200
committerIan Jackson <Ian.Jackson@eu.citrix.com>2013-10-10 16:59:45 +0100
commiteba971d94289d91e4a3959d2c083a59deb100568 (patch)
treef9cecd38f733af031bafa0b57b7a00286adffb58
parent4d747f7c638b6cc6fce8f98ce89b53b4eefc991a (diff)
downloadxen-stable-4.2.tar.gz
xen-stable-4.2.tar.bz2
xen-stable-4.2.zip
libxl: fix out-of-memory error handling in libxl_list_cpupoolstable-4.2
...otherwise it will return freed memory. All the current users of this function check already for a NULL return, so use that. Coverity-ID: 1056194 This is CVE-2013-4371 / XSA-70 Signed-off-by: Matthew Daley <mattjd@gmail.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> (cherry picked from commit 4c37ed562224295c0f8b00211287d57cae629782) (cherry picked from commit 2350e70ee06c903a927340f7a0bf9ca25acce3f3)
-rw-r--r--tools/libxl/libxl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 32d788abdb..e8d798e247 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -648,6 +648,7 @@ libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out)
if (!tmp) {
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpupool info");
libxl_cpupoolinfo_list_free(ptr, i);
+ ptr = NULL;
goto out;
}
ptr = tmp;