From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Wed, 13 May 2015 17:37:35 +0000 (-0400)
Subject: xenpm: Initialize cputopo pointer
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3252
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b315cd9cce5b6da7ca89b2d7bad3fb01e7716044;p=xen.git

xenpm: Initialize cputopo pointer

Commit 250f0b43af1a ("libxl/libxc: Move libxl_get_cpu_topology()'s
hypercall buffer management to libxc") broke non-debug compilation:
on error path we may have uninitialized cputopo pointer.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reported-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c
index 24ee6ef9d2..fe2c001841 100644
--- a/tools/misc/xenpm.c
+++ b/tools/misc/xenpm.c
@@ -355,7 +355,7 @@ static void signal_int_handler(int signo)
     int i, j, k;
     struct timeval tv;
     int cx_cap = 0, px_cap = 0;
-    xc_cputopo_t *cputopo;
+    xc_cputopo_t *cputopo = NULL;
     unsigned max_cpus;
 
     if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 )
@@ -960,7 +960,7 @@ void scaling_governor_func(int argc, char *argv[])
 
 void cpu_topology_func(int argc, char *argv[])
 {
-    xc_cputopo_t *cputopo;
+    xc_cputopo_t *cputopo = NULL;
     unsigned max_cpus;
     int i, rc;