External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

selinux: Only close the selabel_handle once

Browse Source 
On selinux driver initialization failure (missing/incorrectly
formatted contexts file), selabel_handle was closed twice.

Introduced by 6159710.
This commit is contained in:
Ján Tomko 2013-10-01 13:15:12 +02:00
parent bc3070c719
commit f1bdcb2be9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/security/security_selinux.c
View File

@ -460,6 +460,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr)
error: error:
# if HAVE_SELINUX_LABEL_H # if HAVE_SELINUX_LABEL_H
selabel_close(data->label_handle); selabel_close(data->label_handle);
data->label_handle = NULL;
# endif # endif
virConfFree(selinux_conf); virConfFree(selinux_conf);
VIR_FREE(data->domain_context); VIR_FREE(data->domain_context);
@ -547,6 +548,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr)
error: error:
#if HAVE_SELINUX_LABEL_H #if HAVE_SELINUX_LABEL_H
selabel_close(data->label_handle); selabel_close(data->label_handle);
data->label_handle = NULL;
#endif #endif
VIR_FREE(data->domain_context); VIR_FREE(data->domain_context);
VIR_FREE(data->alt_domain_context); VIR_FREE(data->alt_domain_context);
@ -808,7 +810,8 @@ virSecuritySELinuxSecurityDriverClose(virSecurityManagerPtr mgr)
return 0; return 0;
#if HAVE_SELINUX_LABEL_H #if HAVE_SELINUX_LABEL_H
selabel_close(data->label_handle); if (data->label_handle)
selabel_close(data->label_handle);
#endif #endif
virHashFree(data->mcs); virHashFree(data->mcs);