[PATCH 1/4] security: Remove labelling of 'externalDataStore'
The feature was never completed and is not really being pursued. Remove
the storage driver integration.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/security/security_dac.c | 15 ---------------
src/security/security_selinux.c | 17 +----------------
src/security/virt-aa-helper.c | 4 ----
3 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 11fff63bc7..bdc2d7edf3 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -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;
}
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 281c303296..9a929debe1 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -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;
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 8526b7b985..6e6dd1b1db 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -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++;
}
--
2.26.0