From: Soren Hansen <soren@linux2go.dk>
Date: Thu, 3 Mar 2011 14:47:48 +0000 (+0100)
Subject: Pass virSecurityManagerPtr to virSecurityDAC{Set, Restore}ChardevCallback
X-Git-Tag: CVE-2011-1146~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5f3b90e975a21222985641abb4ebaef0e616714;p=thirdparty%2Flibvirt.git

Pass virSecurityManagerPtr to virSecurityDAC{Set, Restore}ChardevCallback

virSecurityDAC{Set,Restore}ChardevCallback expect virSecurityManagerPtr,
but are passed virDomainObjPtr instead. This makes
virSecurityDACSetChardevLabel set a wrong uid/gid on chardevs. This
patch fixes this behaviour.

Signed-off-by: Soren Hansen <soren@linux2go.dk>
---

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 1c1a037b1c..b8de2321e3 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -509,7 +509,7 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
     if (virDomainChrDefForeach(vm->def,
                                false,
                                virSecurityDACRestoreChardevCallback,
-                               vm) < 0)
+                               mgr) < 0)
         rc = -1;
 
     if (vm->def->os.kernel &&
@@ -565,7 +565,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
     if (virDomainChrDefForeach(vm->def,
                                true,
                                virSecurityDACSetChardevCallback,
-                               vm) < 0)
+                               mgr) < 0)
         return -1;
 
     if (vm->def->os.kernel &&