38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From: Cole Robinson <crobinso@redhat.com>
|
|
Date: Mon, 28 Sep 2015 19:47:09 -0400
|
|
Subject: [PATCH] qemu: Fix dynamic_ownership qemu.conf setting
|
|
|
|
Commit 307fb904 (Sep 10) added a 'privileged' variable when creating
|
|
the DAC driver:
|
|
|
|
@@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
|
|
bool defaultConfined,
|
|
bool requireConfined,
|
|
bool dynamicOwnership,
|
|
+ bool privileged,
|
|
virSecurityManagerDACChownCallback chownCallback)
|
|
|
|
But argument order is mixed up at the caller, swapping dynamicOwnership
|
|
and privileged values. This corrects the argument order
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1266628
|
|
(cherry picked from commit 68572de8228e3971174a83c227fcb018d6f684c7)
|
|
---
|
|
src/qemu/qemu_driver.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index a38e776..fda9cd9 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -430,8 +430,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
|
|
cfg->allowDiskFormatProbing,
|
|
cfg->securityDefaultConfined,
|
|
cfg->securityRequireConfined,
|
|
- virQEMUDriverIsPrivileged(driver),
|
|
cfg->dynamicOwnership,
|
|
+ virQEMUDriverIsPrivileged(driver),
|
|
qemuSecurityChownCallback)))
|
|
goto error;
|
|
if (!stack) {
|