mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
util: virfile: Fix 'unknown cause' error if NFS mount point creation fails
This happens if user requires creation of a directory with specified UID/GID permissions. To accomplish this, we use fork approach and set particular UID/GID permissions in child process. However, child process doesn't have a valid descriptor to a logfile (this is prohibited explicitly) and since parent process doesn't handle negative exit codes from child in any way, 'uknown cause' error is returned to the user. Commit92d9114e
tweaked the way we handle child errors when using fork approach to set specific permissions (features originally introduced by98f6f381
). The same logic should be used to create directories with specified permissions as well. https://bugzilla.redhat.com/show_bug.cgi?id=1230137
This commit is contained in:
parent
fdcb057a28
commit
e9478d9a8b
@ -2384,11 +2384,27 @@ virDirCreate(const char *path,
|
||||
path);
|
||||
goto parenterror;
|
||||
}
|
||||
if (!WIFEXITED(status) || (ret = -WEXITSTATUS(status)) == -EACCES) {
|
||||
/* fall back to the simpler method, which works better in
|
||||
* some cases */
|
||||
return virDirCreateNoFork(path, mode, uid, gid, flags);
|
||||
|
||||
/*
|
||||
* If waitpid succeeded, but if the child exited abnormally or
|
||||
* reported non-zero status, report failure, except for EACCES where
|
||||
* we try to fall back to non-fork method as in the original logic
|
||||
* introduced and explained by commit 98f6f381.
|
||||
*/
|
||||
if (!WIFEXITED(status) || (WEXITSTATUS(status)) != 0) {
|
||||
if (WEXITSTATUS(status) == EACCES)
|
||||
return virDirCreateNoFork(path, mode, uid, gid, flags);
|
||||
char *msg = virProcessTranslateStatus(status);
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("child failed to create '%s': %s"),
|
||||
path, msg);
|
||||
VIR_FREE(msg);
|
||||
if (WIFEXITED(status))
|
||||
ret = -WEXITSTATUS(status);
|
||||
else
|
||||
ret = -EACCES;
|
||||
}
|
||||
|
||||
parenterror:
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user