mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
virfile: Rename virFileUnlink to virFileRemove
Similar to commit id '35847860', it's possible to attempt to create a 'netfs' directory in an NFS root-squash environment which will cause the 'vol-delete' command to fail. It's also possible error paths from the 'vol-create' would result in an error to remove a created directory if the permissions were incorrect (and disallowed root access). Thus rename the virFileUnlink to be virFileRemove to match the C API functionality, adjust the code to following using rmdir or unlink depending on the path type, and then use/call it for the VIR_STORAGE_VOL_DIR
This commit is contained in:
parent
91c8e75f44
commit
1b046a6837
@ -1454,6 +1454,7 @@ virFileReadAllQuiet;
|
||||
virFileReadHeaderFD;
|
||||
virFileReadLimFD;
|
||||
virFileRelLinkPointsTo;
|
||||
virFileRemove;
|
||||
virFileResolveAllLinks;
|
||||
virFileResolveLink;
|
||||
virFileRewrite;
|
||||
@ -1461,7 +1462,6 @@ virFileSanitizePath;
|
||||
virFileSkipRoot;
|
||||
virFileStripSuffix;
|
||||
virFileTouch;
|
||||
virFileUnlink;
|
||||
virFileUnlock;
|
||||
virFileUpdatePerm;
|
||||
virFileWaitForDevices;
|
||||
|
@ -1203,24 +1203,22 @@ virStorageBackendFileSystemVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
|
||||
switch ((virStorageVolType) vol->type) {
|
||||
case VIR_STORAGE_VOL_FILE:
|
||||
if (virFileUnlink(vol->target.path, vol->target.perms->uid,
|
||||
case VIR_STORAGE_VOL_DIR:
|
||||
if (virFileRemove(vol->target.path, vol->target.perms->uid,
|
||||
vol->target.perms->gid) < 0) {
|
||||
/* Silently ignore failures where the vol has already gone away */
|
||||
if (errno != ENOENT) {
|
||||
if (vol->type == VIR_STORAGE_VOL_FILE)
|
||||
virReportSystemError(errno,
|
||||
_("cannot unlink file '%s'"),
|
||||
vol->target.path);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case VIR_STORAGE_VOL_DIR:
|
||||
if (rmdir(vol->target.path) < 0) {
|
||||
else
|
||||
virReportSystemError(errno,
|
||||
_("cannot remove directory '%s'"),
|
||||
vol->target.path);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case VIR_STORAGE_VOL_BLOCK:
|
||||
case VIR_STORAGE_VOL_NETWORK:
|
||||
|
@ -2315,8 +2315,8 @@ virFileOpenAs(const char *path, int openflags, mode_t mode,
|
||||
}
|
||||
|
||||
|
||||
/* virFileUnlink:
|
||||
* @path: file to unlink
|
||||
/* virFileRemove:
|
||||
* @path: file to unlink or directory to remove
|
||||
* @uid: uid that was used to create the file (not required)
|
||||
* @gid: gid that was used to create the file (not required)
|
||||
*
|
||||
@ -2327,7 +2327,7 @@ virFileOpenAs(const char *path, int openflags, mode_t mode,
|
||||
* from the child.
|
||||
*/
|
||||
int
|
||||
virFileUnlink(const char *path,
|
||||
virFileRemove(const char *path,
|
||||
uid_t uid,
|
||||
gid_t gid)
|
||||
{
|
||||
@ -2341,8 +2341,12 @@ virFileUnlink(const char *path,
|
||||
* the file/volume, then use unlink directly
|
||||
*/
|
||||
if ((geteuid() != 0) ||
|
||||
((uid == (uid_t) -1) && (gid == (gid_t) -1)))
|
||||
((uid == (uid_t) -1) && (gid == (gid_t) -1))) {
|
||||
if (virFileIsDir(path))
|
||||
return rmdir(path);
|
||||
else
|
||||
return unlink(path);
|
||||
}
|
||||
|
||||
/* Otherwise, we have to deal with the NFS root-squash craziness
|
||||
* to run under the uid/gid that created the volume in order to
|
||||
@ -2406,10 +2410,17 @@ virFileUnlink(const char *path,
|
||||
goto childerror;
|
||||
}
|
||||
|
||||
if (virFileIsDir(path)) {
|
||||
if (rmdir(path) < 0) {
|
||||
ret = errno;
|
||||
goto childerror;
|
||||
}
|
||||
} else {
|
||||
if (unlink(path) < 0) {
|
||||
ret = errno;
|
||||
goto childerror;
|
||||
}
|
||||
}
|
||||
|
||||
childerror:
|
||||
if ((ret & 0xff) != ret) {
|
||||
@ -2643,7 +2654,7 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED,
|
||||
}
|
||||
|
||||
int
|
||||
virFileUnlink(const char *path,
|
||||
virFileRemove(const char *path,
|
||||
uid_t uid ATTRIBUTE_UNUSED,
|
||||
gid_t gid ATTRIBUTE_UNUSED)
|
||||
{
|
||||
|
@ -219,7 +219,7 @@ int virFileOpenAs(const char *path, int openflags, mode_t mode,
|
||||
uid_t uid, gid_t gid,
|
||||
unsigned int flags)
|
||||
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
|
||||
int virFileUnlink(const char *path, uid_t uid, gid_t gid);
|
||||
int virFileRemove(const char *path, uid_t uid, gid_t gid);
|
||||
|
||||
enum {
|
||||
VIR_DIR_CREATE_NONE = 0,
|
||||
|
Loading…
Reference in New Issue
Block a user