|
 |
7a3408 |
From 76d622dec775b332594c46fa55d1fd33785d1d62 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <76d622dec775b332594c46fa55d1fd33785d1d62@dist-git>
|
|
|
7a3408 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
7a3408 |
Date: Tue, 29 Sep 2015 15:57:34 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemu: Fix dynamic_ownership qemu.conf setting
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1266628
|
|
|
7a3408 |
|
|
|
7a3408 |
Commit 307fb904 (Sep 10) added a 'privileged' variable when creating
|
|
|
7a3408 |
the DAC driver:
|
|
|
7a3408 |
|
|
|
7a3408 |
@@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
|
|
|
7a3408 |
bool defaultConfined,
|
|
|
7a3408 |
bool requireConfined,
|
|
|
7a3408 |
bool dynamicOwnership,
|
|
|
7a3408 |
+ bool privileged,
|
|
|
7a3408 |
virSecurityManagerDACChownCallback chownCallback)
|
|
|
7a3408 |
|
|
|
7a3408 |
But argument order is mixed up at the caller, swapping dynamicOwnership
|
|
|
7a3408 |
and privileged values. This corrects the argument order
|
|
|
7a3408 |
|
|
|
7a3408 |
(cherry picked from commit 68572de8228e3971174a83c227fcb018d6f684c7)
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1267154
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_driver.c | 2 +-
|
|
|
7a3408 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
7a3408 |
index e77e548..bdebf13 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_driver.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_driver.c
|
|
|
7a3408 |
@@ -431,8 +431,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
|
|
|
7a3408 |
cfg->allowDiskFormatProbing,
|
|
|
7a3408 |
cfg->securityDefaultConfined,
|
|
|
7a3408 |
cfg->securityRequireConfined,
|
|
|
7a3408 |
- virQEMUDriverIsPrivileged(driver),
|
|
|
7a3408 |
cfg->dynamicOwnership,
|
|
|
7a3408 |
+ virQEMUDriverIsPrivileged(driver),
|
|
|
7a3408 |
qemuSecurityChownCallback)))
|
|
|
7a3408 |
goto error;
|
|
|
7a3408 |
if (!stack) {
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.6.0
|
|
|
7a3408 |
|