NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

command: avoid double close in virExecWithHook

Browse Source 
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.
This commit is contained in:
Ján Tomko
2012-08-21 11:01:44 +02:00
committed by Eric Blake
parent 4efde75fab
commit 8211c677a3
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/command.c
View File

@@ -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 */