提交 89b9b6d3 编写于 作者: J John Ferlan

virfile: Use virProcessWait in virFileOpenForked

Rather than inlining the code, use the common API
上级 1b046a68
...@@ -2063,7 +2063,7 @@ virFileOpenForked(const char *path, int openflags, mode_t mode, ...@@ -2063,7 +2063,7 @@ virFileOpenForked(const char *path, int openflags, mode_t mode,
uid_t uid, gid_t gid, unsigned int flags) uid_t uid, gid_t gid, unsigned int flags)
{ {
pid_t pid; pid_t pid;
int waitret, status, ret = 0; int status = 0, ret = 0;
int recvfd_errno = 0; int recvfd_errno = 0;
int fd = -1; int fd = -1;
int pair[2] = { -1, -1 }; int pair[2] = { -1, -1 };
...@@ -2163,42 +2163,21 @@ virFileOpenForked(const char *path, int openflags, mode_t mode, ...@@ -2163,42 +2163,21 @@ virFileOpenForked(const char *path, int openflags, mode_t mode,
if (fd < 0) if (fd < 0)
recvfd_errno = errno; recvfd_errno = errno;
/* wait for child to complete, and retrieve its exit code if (virProcessWait(pid, &status, 0) < 0) {
* if waitpid fails, use that status /* virProcessWait() reports errno on waitpid failure, so we'll just
* set our return status to EINTR; otherwise, set status to EACCES
* since the original failure for the fork+setuid path would have
* been EACCES or EPERM by definition.
*/ */
while ((waitret = waitpid(pid, &status, 0)) == -1 && errno == EINTR); if (virLastErrorIsSystemErrno(0))
if (waitret == -1) { status = EINTR;
ret = -errno; else if (!status)
virReportSystemError(errno, status = EACCES;
_("failed to wait for child creating '%s'"),
path);
VIR_FORCE_CLOSE(fd);
return ret;
} }
/* if (status) {
* If waitpid succeeded, but if the child exited abnormally or
* reported non-zero status, report failure.
*/
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
char *msg = virProcessTranslateStatus(status);
virReportError(VIR_ERR_INTERNAL_ERROR,
_("child failed to create '%s': %s"),
path, msg);
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
VIR_FREE(msg); return -status;
/* Use child exit status if possible; otherwise,
* just use -EACCES, since by our original failure in
* the non fork+setuid path would have been EACCES or
* EPERM by definition (see qemuOpenFileAs after the
* first virFileOpenAs failure), but EACCES is close enough.
* Besides -EPERM is like returning fd == -1.
*/
if (WIFEXITED(status))
ret = -WEXITSTATUS(status);
else
ret = -EACCES;
return ret;
} }
/* if waitpid succeeded, but recvfd failed, report recvfd_errno */ /* if waitpid succeeded, but recvfd failed, report recvfd_errno */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册