External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Don't change ownership of file when appending to it

Browse Source 
Saving domain to previously created file changes also its ownership.
This is certainly not what users want if some conditions are met:
it is a regular, local file and dynamic_ownership is off.
This commit is contained in:
Michal Privoznik 2011-05-24 14:36:08 +02:00
parent b43b6c2ad5
commit 764c282cdf
1 changed files with 11 additions and 1 deletions

12
src/qemu/qemu_driver.c

@ -1963,6 +1963,8 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom,
bool is_reg = false; bool is_reg = false;
unsigned long long offset; unsigned long long offset;
int fd = -1; int fd = -1;
uid_t uid = getuid();
gid_t gid = getgid();
memset(&header, 0, sizeof(header)); memset(&header, 0, sizeof(header));
memcpy(header.magic, QEMUD_SAVE_MAGIC, sizeof(header.magic)); memcpy(header.magic, QEMUD_SAVE_MAGIC, sizeof(header.magic));
@ -2013,6 +2015,14 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom,
is_reg = true; is_reg = true;
} else { } else {
is_reg = !!S_ISREG(sb.st_mode); is_reg = !!S_ISREG(sb.st_mode);
/* If the path is regular local file which exists
* already and dynamic_ownership is off, we don't
* want to change it's ownership, just open it as-is */
if (is_reg && !driver->dynamicOwnership &&
virStorageFileIsSharedFS(path) == 0) {
uid=sb.st_uid;
gid=sb.st_gid;
}
} }
offset = sizeof(header) + header.xml_len; offset = sizeof(header) + header.xml_len;
@ -2048,7 +2058,7 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom,
} else { } else {
if ((fd = virFileOpenAs(path, O_CREAT|O_TRUNC|O_WRONLY, if ((fd = virFileOpenAs(path, O_CREAT|O_TRUNC|O_WRONLY,
S_IRUSR|S_IWUSR, S_IRUSR|S_IWUSR,
getuid(), getgid(), 0)) < 0) { uid, gid, 0)) < 0) {
/* If we failed as root, and the error was permission-denied /* If we failed as root, and the error was permission-denied
(EACCES or EPERM), assume it's on a network-connected share (EACCES or EPERM), assume it's on a network-connected share
where root access is restricted (eg, root-squashed NFS). If the where root access is restricted (eg, root-squashed NFS). If the