External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't raise errors in the selinux restore code

Browse Source 
The restore code is done in places where errors cannot be
raised, since they will overwrite over pre-existing errors.

* src/security/security_selinux.c: Only warn about failures
  in label restore, don't report errors
This commit is contained in:
Daniel P. Berrange 2010-05-28 12:19:13 +01:00
parent c833efd35b
commit f43dc26af7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/security/security_selinux.c
View File

@ -347,6 +347,9 @@ SELinuxSetFilecon(const char *path, char *tcon)
return 0;
}
/* This method shouldn't raise errors, since they'll overwrite
* errors that the caller(s) are already dealing with */
static int
SELinuxRestoreSecurityFileLabel(const char *path)
{
@ -354,27 +357,27 @@ SELinuxRestoreSecurityFileLabel(const char *path)
security_context_t fcon = NULL;
int rc = -1;
char *newpath = NULL;
char ebuf[1024];
VIR_INFO("Restoring SELinux context on '%s'", path);
if (virFileResolveLink(path, &newpath) < 0) {
virReportSystemError(errno,
_("cannot resolve symlink %s"), path);
VIR_WARN("cannot resolve symlink %s: %s", path,
virStrerror(errno, ebuf, sizeof(ebuf)));
goto err;
}
if (stat(newpath, &buf) != 0) {
virReportSystemError(errno,
_("cannot stat %s"), newpath);
VIR_WARN("cannot stat %s: %s", newpath,
virStrerror(errno, ebuf, sizeof(ebuf)));
goto err;
}
if (matchpathcon(newpath, buf.st_mode, &fcon) == 0) {
rc = SELinuxSetFilecon(newpath, fcon);
} else {
virSecurityReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot restore selinux file label for %s"),
newpath);
VIR_WARN("cannot lookup default selinux label for %s",
newpath);
}
err: