[libvirt] [PATCH] selinux: Only close the selabel_handle once

On selinux driver initialization failure (missing/incorrectly formated contexts file), selabel_handle was closed twice. Introduced by 6159710. --- src/security/security_selinux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 38de060..c408fa8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -460,6 +460,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) error: # if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); + data->label_handle = NULL; # endif virConfFree(selinux_conf); VIR_FREE(data->domain_context); @@ -547,6 +548,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) error: #if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); + data->label_handle = NULL; #endif VIR_FREE(data->domain_context); VIR_FREE(data->alt_domain_context); @@ -808,7 +810,8 @@ virSecuritySELinuxSecurityDriverClose(virSecurityManagerPtr mgr) return 0; #if HAVE_SELINUX_LABEL_H - selabel_close(data->label_handle); + if (data->label_handle) + selabel_close(data->label_handle); #endif virHashFree(data->mcs); -- 1.8.1.5

On 10/01/2013 06:44 AM, Ján Tomko wrote:
On selinux driver initialization failure (missing/incorrectly formated contexts file), selabel_handle was closed twice.
s/formated/formatted/
Introduced by 6159710. --- src/security/security_selinux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 10/01/2013 02:52 PM, Eric Blake wrote:
On 10/01/2013 06:44 AM, Ján Tomko wrote:
On selinux driver initialization failure (missing/incorrectly formated contexts file), selabel_handle was closed twice.
s/formated/formatted/
Introduced by 6159710. --- src/security/security_selinux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
ACK.
Fixed and pushed, thanks. Jan
participants (2)
-
Eric Blake
-
Ján Tomko