External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

apparmor: refactor AppArmorSetSecurityImageLabel

Browse Source 
A lot of the code in AppArmorSetSecurityImageLabel is a duplicate of
what is in reload_profile, this refactors AppArmorSetSecurityImageLabel
to use reload_profile instead.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Acked-by: Jamie Strandboge <jamie@canonical.com>
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
This commit is contained in:
Christian Ehrhardt 2019-10-16 09:32:52 +02:00
parent 70cf0af7bf
commit 9714f270f1
No known key found for this signature in database
GPG Key ID: BA3E29338280B242
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/security/security_apparmor.c
View File

@ -778,8 +778,6 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr,
virStorageSourcePtr src, virStorageSourcePtr src,
virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED)
{ {
int rc = -1;
char *profile_name = NULL;
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
if (!src->path || !virStorageSourceIsLocalStorage(src)) if (!src->path || !virStorageSourceIsLocalStorage(src))
@ -789,7 +787,9 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr,
if (!secdef || !secdef->relabel) if (!secdef || !secdef->relabel)
return 0; return 0;
if (secdef->imagelabel) { if (!secdef->imagelabel)
return 0;
/* if the device doesn't exist, error out */ /* if the device doesn't exist, error out */
if (!virFileExists(src->path)) { if (!virFileExists(src->path)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -798,27 +798,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr,
return -1; return -1;
} }
if ((profile_name = get_profile_name(def)) == NULL) return reload_profile(mgr, def, src->path, false);
return -1;
/* update the profile only if it is loaded */
if (profile_loaded(secdef->imagelabel) >= 0) {
if (load_profile(mgr, secdef->imagelabel, def,
src->path, false) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot update AppArmor profile "
"\'%s\'"),
secdef->imagelabel);
goto cleanup;
}
}
}
rc = 0;
cleanup:
VIR_FREE(profile_name);
return rc;
} }
static int static int