External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 07:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

command: check for fork error before closing fd

Browse Source 
We should not set *outfd or *errfd if virExecWithHook() failed
because the caller may close these fds.

Bug present since v0.4.5 (commit 60ed1d2a).
This commit is contained in:
Wen Congyang 2012-05-30 17:20:44 +08:00 committed by Eric Blake
parent f3cfc7c884
commit 746ff701e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/command.c
View File

@ -492,6 +492,10 @@ virExecWithHook(const char *const*argv,
} }
if (pid) { /* parent */ if (pid) { /* parent */
if (forkRet < 0) {
goto cleanup;
}
VIR_FORCE_CLOSE(null); VIR_FORCE_CLOSE(null);
if (outfd && *outfd == -1) { if (outfd && *outfd == -1) {
VIR_FORCE_CLOSE(pipeout[1]); VIR_FORCE_CLOSE(pipeout[1]);
@ -502,10 +506,6 @@ virExecWithHook(const char *const*argv,
*errfd = pipeerr[0]; *errfd = pipeerr[0];
} }
if (forkRet < 0) {
goto cleanup;
}
*retpid = pid; *retpid = pid;
if (binary != argv[0]) if (binary != argv[0])