External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virfile: Add extra check for direct delete in virFileRemove

Browse Source 
Unlike create options, if the file to be removed is already in the
pool, then the uid/gid will come from the pool. If it's the same as the
currently running process, then just do the unlink/rmdir directly
rather than going through the fork processing unnecessarily
This commit is contained in:
John Ferlan 2015-09-30 17:25:34 -04:00
parent 938368f838
commit c6b32d6801
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/virfile.c
View File

@ -2316,10 +2316,11 @@ virFileRemove(const char *path,
int ngroups; int ngroups;
/* If not running as root or if a non explicit uid/gid was being used for /* If not running as root or if a non explicit uid/gid was being used for
* the file/volume, then use unlink directly * the file/volume or the explicit uid/gid matches, then use unlink directly
*/ */
if ((geteuid() != 0) || if ((geteuid() != 0) ||
((uid == (uid_t) -1) && (gid == (gid_t) -1))) { ((uid == (uid_t) -1) && (gid == (gid_t) -1)) ||
(uid == geteuid() && gid == getegid())) {
if (virFileIsDir(path)) if (virFileIsDir(path))
return rmdir(path); return rmdir(path);
else else