External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 13:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

security_dac: Fix info messages when chown()-ing

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2018-08-22 15:37:57 +02:00
parent c0b68c6e19
commit 6e22ab2701
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/security/security_dac.c
View File

@ -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);
}