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

Guido Günther agx at sigxcpu.org
Fri Jan 20 18:04:02 UTC 2012


On Fri, Jan 20, 2012 at 05:01:48PM +0000, Daniel P. Berrange wrote:
> 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

There at least doesn't seem to be an error output when we're crashing
here:

	http://bugs.debian.org/656075

so I thought it might be better to have an additional warning until we
tracked things down.
Cheers,
 -- Guido




More information about the libvir-list mailing list