From 65181d419e3cc48873bfb5dbd7a885dd4f45119b Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 7 Oct 2019 15:53:27 -0400 Subject: [PATCH] security: selinux: Drop !parent handling in SetImageLabelInternal The only caller always passes in a non-null parent Reviewed-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik Signed-off-by: Cole Robinson --- src/security/security_selinux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 14b7917225..fe65513317 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1851,9 +1851,8 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr, disk_seclabel = virStorageSourceGetSecurityLabelDef(src, SECURITY_SELINUX_NAME); - if (parent) - parent_seclabel = virStorageSourceGetSecurityLabelDef(parent, - SECURITY_SELINUX_NAME); + parent_seclabel = virStorageSourceGetSecurityLabelDef(parent, + SECURITY_SELINUX_NAME); if (disk_seclabel && (!disk_seclabel->relabel || disk_seclabel->label)) { if (!disk_seclabel->relabel) @@ -1865,7 +1864,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr, return 0; use_label = parent_seclabel->label; - } else if (!parent || parent == src) { + } else if (parent == src) { if (src->shared) { use_label = data->file_context; } else if (src->readonly) { -- 2.47.2