forked from pool/libvirt
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
commit 789999f481b31398f147e547550184bf303ce729
|
||
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
||
|
|
Date: Thu Feb 2 19:17:29 2017 -0700
|
||
|
|
|
||
|
|
apparmor: don't overwrite error from reload_profile
|
||
|
|
|
||
|
|
Like other callers of reload_profile, don't overwrite errors in
|
||
|
|
AppArmorSetSecurityHostdevLabelHelper.
|
||
|
|
|
||
|
|
Index: libvirt-3.0.0/src/security/security_apparmor.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-3.0.0.orig/src/security/security_apparmor.c
|
||
|
|
+++ libvirt-3.0.0/src/security/security_apparmor.c
|
||
|
|
@@ -322,19 +322,7 @@ AppArmorSetSecurityHostdevLabelHelper(co
|
||
|
|
struct SDPDOP *ptr = opaque;
|
||
|
|
virDomainDefPtr def = ptr->def;
|
||
|
|
|
||
|
|
- if (reload_profile(ptr->mgr, def, file, true) < 0) {
|
||
|
|
- virSecurityLabelDefPtr secdef = virDomainDefGetSecurityLabelDef(
|
||
|
|
- def, SECURITY_APPARMOR_NAME);
|
||
|
|
- if (!secdef) {
|
||
|
|
- virReportOOMError();
|
||
|
|
- return -1;
|
||
|
|
- }
|
||
|
|
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
||
|
|
- _("cannot update AppArmor profile \'%s\'"),
|
||
|
|
- secdef->imagelabel);
|
||
|
|
- return -1;
|
||
|
|
- }
|
||
|
|
- return 0;
|
||
|
|
+ return reload_profile(ptr->mgr, def, file, true);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int
|