[libvirt] [PATCH] Prevent crash of libvirtd when attaching to existing qemu process

[Eric Blake]

On 12/07/2011 11:27 AM, Jim Fehlig wrote:
> With security_driver set to "none" in /etc/libvirt/qemu.conf,
> libvirtd would crash when attempted to attach to an existing
> qemu process.  Only copy the security model if it actually exists.
> ---
>  src/qemu/qemu_process.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 9309761..45ed011 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -3609,7 +3609,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
>      if (virSecurityManagerGetProcessLabel(driver->securityManager,
>                                            vm, seclabel) < 0)
>          goto cleanup;
> -    if (!(vm->def->seclabel.model = strdup(driver->caps->host.secModel.model)))
> +    if (driver->caps->host.secModel.model &&
> +        !(vm->def->seclabel.model = strdup(driver->caps->host.secModel.model)))

ACK.

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20111207/b2f69876/attachment-0001.sig>