[libvirt] [PATCH] xen: Don't crash when we fail to init caps

Daniel P. Berrange berrange at redhat.com
Fri Jan 20 17:01:48 UTC 2012


On Fri, Jan 20, 2012 at 05:57:34PM +0100, Guido Günther wrote:
> by dereferencing a NULL pointer in the call to
> virNodeSuspendGetTargetMask.
> 
> Only warn but Don't set an error to not overwrite an error code set by
> xenHypervisorMakeCapabilities.
> ---
>  src/xen/xen_hypervisor.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
> index 2bb3466..855576c 100644
> --- a/src/xen/xen_hypervisor.c
> +++ b/src/xen/xen_hypervisor.c
> @@ -2764,6 +2764,10 @@ xenHypervisorMakeCapabilities(virConnectPtr conn)
>                                                   utsname.machine,
>                                                   cpuinfo,
>                                                   capabilities);
> +    if (caps == NULL) {
> +        VIR_WARN("Failed to get host capabilities");
> +        return NULL;
> +    }

Shouldn't be any need for a warning there since the method
we just called should have raised an error

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|




More information about the libvir-list mailing list