提交 3c12a67b 编写于 作者: L Laine Stump 提交者: Daniel Veillard

Make domain save work on root-squash NFS

Move *all* file operations related to creation and writing of libvirt
header to the domain save file into a hook function that is called by
virFileOperation. First try to call virFileOperation as root. If that
fails with EACCESS, and (in the case of Linux) statfs says that we're
trying to save the file on an NFS share, rerun virFileOperation,
telling it to fork a child process and setuid to the qemu user. This
is the only way we can successfully create a file on a root-squashed
NFS server.

This patch (along with setting dynamic_ownership=0 in qemu.conf)
makes qemudDomainSave work on root-squashed NFS.

* src/qemu/qemu_driver.c: provide new qemudDomainSaveFileOpHook()
  utility, use it in qemudDomainSave() if normal creation of the
  file as root failed, and after checking the filesystem type for
  the storage is NFS. In that case we also bypass the security
  driver, as this would fail on NFS.
上级 a03121bc
...@@ -47,6 +47,11 @@ ...@@ -47,6 +47,11 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/un.h> #include <sys/un.h>
#ifdef __linux__
#include <sys/vfs.h>
#include <linux/magic.h>
#endif
#include "virterror_internal.h" #include "virterror_internal.h"
#include "logging.h" #include "logging.h"
#include "datatypes.h" #include "datatypes.h"
...@@ -4069,14 +4074,44 @@ struct qemud_save_header { ...@@ -4069,14 +4074,44 @@ struct qemud_save_header {
int unused[15]; int unused[15];
}; };
struct fileOpHookData {
virDomainPtr dom;
const char *path;
char *xml;
struct qemud_save_header *header;
};
static int qemudDomainSaveFileOpHook(int fd, void *data) {
struct fileOpHookData *hdata = data;
int ret = 0;
if (safewrite(fd, hdata->header, sizeof(*hdata->header)) != sizeof(*hdata->header)) {
ret = errno;
qemuReportError(VIR_ERR_OPERATION_FAILED,
_("failed to write save header to '%s'"), hdata->path);
goto endjob;
}
if (safewrite(fd, hdata->xml, hdata->header->xml_len) != hdata->header->xml_len) {
ret = errno;
qemuReportError(VIR_ERR_OPERATION_FAILED,
_("failed to write xml to '%s'"), hdata->path);
goto endjob;
}
endjob:
return ret;
}
static int qemudDomainSave(virDomainPtr dom, static int qemudDomainSave(virDomainPtr dom,
const char *path) const char *path)
{ {
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int fd = -1;
char *xml = NULL; char *xml = NULL;
struct qemud_save_header header; struct qemud_save_header header;
struct fileOpHookData hdata;
int bypassSecurityDriver = 0;
int ret = -1; int ret = -1;
int rc; int rc;
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
...@@ -4144,34 +4179,113 @@ static int qemudDomainSave(virDomainPtr dom, ...@@ -4144,34 +4179,113 @@ static int qemudDomainSave(virDomainPtr dom,
} }
header.xml_len = strlen(xml) + 1; header.xml_len = strlen(xml) + 1;
/* Setup hook data needed by virFileOperation hook function */
hdata.dom = dom;
hdata.path = path;
hdata.xml = xml;
hdata.header = &header;
/* Write header to file, followed by XML */ /* Write header to file, followed by XML */
if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) {
qemuReportError(VIR_ERR_OPERATION_FAILED, /* First try creating the file as root */
_("failed to create '%s'"), path); if ((rc = virFileOperation(path, O_CREAT|O_TRUNC|O_WRONLY,
S_IRUSR|S_IWUSR,
getuid(), getgid(),
qemudDomainSaveFileOpHook, &hdata,
0)) != 0) {
/* If we failed as root, and the error was permission-denied
(EACCES), assume it's on a network-connected share where
root access is restricted (eg, root-squashed NFS). If the
qemu user (driver->user) is non-root, just set a flag to
bypass security driver shenanigans, and retry the operation
after doing setuid to qemu user */
if ((rc != EACCES) ||
driver->user == getuid()) {
virReportSystemError(rc, _("Failed to create domain save file '%s'"),
path);
goto endjob; goto endjob;
} }
if (safewrite(fd, &header, sizeof(header)) != sizeof(header)) { #ifdef __linux__
qemuReportError(VIR_ERR_OPERATION_FAILED, /* On Linux we can also verify the FS-type of the directory. */
"%s", _("failed to write save header")); char *dirpath, *p;
struct statfs st;
int statfs_ret;
if ((dirpath = strdup(path)) == NULL) {
virReportOOMError();
goto endjob; goto endjob;
} }
if (safewrite(fd, xml, header.xml_len) != header.xml_len) { do {
qemuReportError(VIR_ERR_OPERATION_FAILED, // Try less and less of the path until we get to a
"%s", _("failed to write xml")); // directory we can stat. Even if we don't have 'x'
// permission on any directory in the path on the NFS
// server (assuming it's NFS), we will be able to stat the
// mount point, and that will properly tell us if the
// fstype is NFS.
if ((p = strrchr(dirpath, '/')) == NULL) {
qemuReportError(VIR_ERR_INVALID_ARG,
_("Invalid relative path '%s' for domain save file"),
path);
VIR_FREE(dirpath);
goto endjob; goto endjob;
} }
if (close(fd) < 0) { if (p == dirpath)
*(p+1) = '\0';
else
*p = '\0';
statfs_ret = statfs(dirpath, &st);
} while ((statfs_ret == -1) && (p != dirpath));
if (statfs_ret == -1) {
virReportSystemError(errno, virReportSystemError(errno,
_("unable to save file %s"), _("Failed to create domain save file '%s'"
" statfs of all elements of path failed."),
path); path);
VIR_FREE(dirpath);
goto endjob; goto endjob;
} }
fd = -1;
if (driver->securityDriver && if (st.f_type != NFS_SUPER_MAGIC) {
virReportSystemError(rc,
_("Failed to create domain save file '%s'"
" (fstype of '%s' is 0x%X"),
path, dirpath, (unsigned int) st.f_type);
VIR_FREE(dirpath);
goto endjob;
}
VIR_FREE(dirpath);
#endif
/* Retry creating the file as driver->user */
if ((rc = virFileOperation(path, O_CREAT|O_TRUNC|O_WRONLY,
S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
driver->user, driver->group,
qemudDomainSaveFileOpHook, &hdata,
VIR_FILE_OP_AS_UID)) != 0) {
virReportSystemError(rc, _("Error from child process creating '%s'"),
path);
goto endjob;
}
/* Since we had to setuid to create the file, and the fstype
is NFS, we assume it's a root-squashing NFS share, and that
the security driver stuff would have failed anyway */
bypassSecurityDriver = 1;
}
if ((!bypassSecurityDriver) &&
driver->securityDriver &&
driver->securityDriver->domainSetSavedStateLabel && driver->securityDriver->domainSetSavedStateLabel &&
driver->securityDriver->domainSetSavedStateLabel(vm, path) == -1) driver->securityDriver->domainSetSavedStateLabel(vm, path) == -1)
goto endjob; goto endjob;
...@@ -4201,7 +4315,8 @@ static int qemudDomainSave(virDomainPtr dom, ...@@ -4201,7 +4315,8 @@ static int qemudDomainSave(virDomainPtr dom,
if (rc < 0) if (rc < 0)
goto endjob; goto endjob;
if (driver->securityDriver && if ((!bypassSecurityDriver) &&
driver->securityDriver &&
driver->securityDriver->domainRestoreSavedStateLabel && driver->securityDriver->domainRestoreSavedStateLabel &&
driver->securityDriver->domainRestoreSavedStateLabel(vm, path) == -1) driver->securityDriver->domainRestoreSavedStateLabel(vm, path) == -1)
goto endjob; goto endjob;
...@@ -4236,8 +4351,6 @@ endjob: ...@@ -4236,8 +4351,6 @@ endjob:
vm = NULL; vm = NULL;
cleanup: cleanup:
if (fd != -1)
close(fd);
VIR_FREE(xml); VIR_FREE(xml);
if (ret != 0) if (ret != 0)
unlink(path); unlink(path);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册