[libvirt] [PATCH] security: selinux: Fix crash when releasing non-existent label

Daniel P. Berrange berrange at redhat.com
Mon Mar 22 15:05:04 UTC 2010


On Mon, Mar 22, 2010 at 10:48:32AM -0400, Cole Robinson wrote:
> This can be triggered by the qemuStartVMDaemon cleanup path if a
> VM references a non-existent USB device (by product) in the XML.
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  src/security/security_selinux.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index 975b315..6680e2d 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -632,7 +632,8 @@ SELinuxReleaseSecurityLabel(virDomainObjPtr vm)
>  {
>      const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
>  
> -    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC)
> +    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC ||
> +        secdef->label == NULL)
>          return 0;
>  
>      context_t con = context_new(secdef->label);

ACK

Daniel
-- 
|: Red Hat, Engineering, London    -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :|
|: http://autobuild.org        -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|




More information about the libvir-list mailing list