forked from pool/libvirt
f167ba3466
- apparmor: don't fail on non-apparmor <seclabel> apparmor-errormsg-fix.patch, apparmor-alt-seclabel.patch bsc#1023436 - libxl: fix reporting of domain maximum memory ff225538-libxl-autoballoon-setting.patch, c89a6e78-libxl-physinfo-cleanup.patch, d2b77608-libxl-maxmem-fix.patch, 79692c38-libxl-dom0-maxmem.patch bsc#1017762 - libxl: set disk format to raw if not specified and fix disk detach 321a28c6-libxl-default-disk-format.patch, bd116810-libxl-fix-disk-detach.patch bsc#1003379 - libxl: fix timer configurations 6e4759d0-libxl-timer-fix.patch, 87df87e0-libxl-timer-tsc-emulate.patch, b4386fda-xenconfig-timer-fix.patch, d3970925-timer-tests.patch bsc#1019969 OBS-URL: https://build.opensuse.org/request/show/456194 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=583
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
|