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

security: Remove labelling of 'externalDataStore'

Browse Source 
The feature was never completed and is not really being pursued. Remove
the storage driver integration.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-04-24 11:08:04 +02:00
parent 4aa1ab0e79
commit 062d8f0ebe
3 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/security/security_dac.c
View File

@ -983,14 +983,6 @@ virSecurityDACSetImageLabelRelative(virSecurityManagerPtr mgr,
if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
return -1;
if (n->externalDataStore &&
virSecurityDACSetImageLabelRelative(mgr,
def,
n->externalDataStore,
parent,
flags) < 0)
return -1;
if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
break;
@ -1090,13 +1082,6 @@ virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr,
if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
return -1;
if (src->externalDataStore &&
virSecurityDACRestoreImageLabelSingle(mgr,
def,
src->externalDataStore,
migrated) < 0)
return -1;
return 0;
}

17
src/security/security_selinux.c
View File

@ -1806,13 +1806,6 @@ virSecuritySELinuxRestoreImageLabelInt(virSecurityManagerPtr mgr,
if (virSecuritySELinuxRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
return -1;
if (src->externalDataStore &&
virSecuritySELinuxRestoreImageLabelSingle(mgr,
def,
src->externalDataStore,
migrated) < 0)
return -1;
return 0;
}
@ -1880,7 +1873,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
return 0;
use_label = parent_seclabel->label;
} else if (parent == src || parent->externalDataStore == src) {
} else if (parent == src) {
if (src->shared) {
use_label = data->file_context;
} else if (src->readonly) {
@ -1942,14 +1935,6 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityManagerPtr mgr,
if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
return -1;
if (n->externalDataStore &&
virSecuritySELinuxSetImageLabelRelative(mgr,
def,
n->externalDataStore,
parent,
flags) < 0)
return -1;
if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
break;

4
src/security/virt-aa-helper.c
View File

@ -898,10 +898,6 @@ storage_source_add_files(virStorageSourcePtr src,
if (add_file_path(tmp, depth, buf) < 0)
return -1;
if (tmp->externalDataStore &&
storage_source_add_files(tmp->externalDataStore, buf, depth) < 0)
return -1;
depth++;
}