From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 22 Aug 2018 13:37:57 +0000 (+0200)
Subject: security_dac: Fix info messages when chown()-ing
X-Git-Tag: v4.8.0-rc1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e22ab2701298e0aa79024ea3658e4eb257ffe29;p=thirdparty%2Flibvirt.git

security_dac: Fix info messages when chown()-ing

Firstly, the message that says we're setting uid:gid shouldn't be
called from virSecurityDACSetOwnershipInternal() because
virSecurityDACRestoreFileLabelInternal() is calling it too.
Secondly, there are places between us reporting label restore and
us actually doing it where we can quit. Don't say we're doing
something until we are actually about to do it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 289584cc8a..a628d63a52 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -579,9 +579,6 @@ virSecurityDACSetOwnershipInternal(const virSecurityDACData *priv,
     /* Be aware that this function might run in a separate process.
      * Therefore, any driver state changes would be thrown away. */
 
-    VIR_INFO("Setting DAC user and group on '%s' to '%ld:%ld'",
-             NULLSTR(src ? src->path : path), (long)uid, (long)gid);
-
     if (priv && src && priv->chownCallback) {
         rc = priv->chownCallback(src, uid, gid);
         /* here path is used only for error messages */
@@ -674,6 +671,9 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr,
             return -1;
     }
 
+    VIR_INFO("Setting DAC user and group on '%s' to '%ld:%ld'",
+             NULLSTR(src ? src->path : path), (long)uid, (long)gid);
+
     return virSecurityDACSetOwnershipInternal(priv, src, path, uid, gid);
 }
 
@@ -688,9 +688,6 @@ virSecurityDACRestoreFileLabelInternal(virSecurityManagerPtr mgr,
     uid_t uid = 0;  /* By default return to root:root */
     gid_t gid = 0;
 
-    VIR_INFO("Restoring DAC user and group on '%s'",
-             NULLSTR(src ? src->path : path));
-
     if (!path && src && src->path &&
         virStorageSourceIsLocalStorage(src))
         path = src->path;
@@ -711,6 +708,9 @@ virSecurityDACRestoreFileLabelInternal(virSecurityManagerPtr mgr,
             return 0;
     }
 
+    VIR_INFO("Restoring DAC user and group on '%s' to %ld:%ld",
+             NULLSTR(src ? src->path : path), (long)uid, (long)gid);
+
     return virSecurityDACSetOwnershipInternal(priv, src, path, uid, gid);
 }