提交 8211c677 编写于 作者: J Ján Tomko 提交者: Eric Blake

command: avoid double close in virExecWithHook

Fix possible double close in the child process after the fork in case
infd and outfd are equal, just like they are after being called from
virNetSocketNewConnectCommand.
上级 4efde75f
......@@ -547,17 +547,13 @@ virExecWithHook(const char *const*argv,
goto fork_error;
}
if (infd != STDIN_FILENO && infd != null)
if (infd != STDIN_FILENO && infd != null && infd != childerr &&
infd != childout)
VIR_FORCE_CLOSE(infd);
if (childout > STDERR_FILENO && childout != null) {
tmpfd = childout; /* preserve childout value */
VIR_FORCE_CLOSE(tmpfd);
}
if (childerr > STDERR_FILENO &&
childerr != childout &&
childerr != null) {
if (childout > STDERR_FILENO && childout != null && childout != childerr)
VIR_FORCE_CLOSE(childout);
if (childerr > STDERR_FILENO && childerr != null)
VIR_FORCE_CLOSE(childerr);
}
VIR_FORCE_CLOSE(null);
/* Initialize full logging for a while */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册