[PATCH] xenpm: Initialize cputopo pointer

[PATCH] xenpm: Initialize cputopo pointer

[Boris Ostrovsky]

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>
---
 tools/misc/xenpm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c
index 24ee6ef..fe2c001 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;
 
-- 
1.7.1

Re: [PATCH] xenpm: Initialize cputopo pointer

[Wei Liu]

On Wed, May 13, 2015 at 01:37:35PM -0400, Boris Ostrovsky wrote:
> 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>

> ---
>  tools/misc/xenpm.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c
> index 24ee6ef..fe2c001 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;
>  
> -- 
> 1.7.1

Re: [PATCH] xenpm: Initialize cputopo pointer

[Ian Campbell]

On Thu, 2015-05-14 at 04:02 +0100, Wei Liu wrote:
> On Wed, May 13, 2015 at 01:37:35PM -0400, Boris Ostrovsky wrote:
> > 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 + applied, thanks.