summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-06-26 14:39:16 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-06-28 09:39:14 +0100
commit29d5a906ce5ec7e3a25b65e9e90d3598d6c8bd2c (patch)
tree20b00799136f95d71f8d6a0ae3e8b705ce32ada8
parentd2cbbcc782a1164a2dd3b1d8601a1798ae4077a9 (diff)
downloadlibguestfs-29d5a906ce5ec7e3a25b65e9e90d3598d6c8bd2c.tar.gz
libguestfs-29d5a906ce5ec7e3a25b65e9e90d3598d6c8bd2c.tar.xz
libguestfs-29d5a906ce5ec7e3a25b65e9e90d3598d6c8bd2c.zip
launch: Avoid double-close when qemu exits early.
The stdin and stdout of the qemu process are aliased to g->fd: g->fd[0] = wfd[1]; g->fd[1] = rfd[0]; However if the child exits early, then child_cleanup closes g->fd[0], g->fd[1], AND the code at the cleanup1 label closes wfd[1], rfd[0], resulting in a double-close. Avoid this case by setting wfd[1], rfd[0] to -1. In the cleanup1 label, only close wfd[1], rfd[0] if they are not -1, and add the same for g->fd[0], g->fd[1]. (cherry picked from commit c87956837e962072fff61edef5b18e55ad42d730)
-rw-r--r--src/launch.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/launch.c b/src/launch.c
index f756af8b..f1907fa0 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -985,6 +985,7 @@ launch_appliance (guestfs_h *g)
g->fd[0] = wfd[1]; /* stdin of child */
g->fd[1] = rfd[0]; /* stdout of child */
+ wfd[1] = rfd[0] = -1;
} else {
g->fd[0] = open ("/dev/null", O_RDWR|O_CLOEXEC);
if (g->fd[0] == -1) {
@@ -995,6 +996,7 @@ launch_appliance (guestfs_h *g)
if (g->fd[1] == -1) {
perrorf (g, "dup");
close (g->fd[0]);
+ g->fd[0] = -1;
goto cleanup1;
}
}
@@ -1065,13 +1067,15 @@ launch_appliance (guestfs_h *g)
cleanup1:
if (!g->direct) {
- close (wfd[1]);
- close (rfd[0]);
+ if (wfd[1] >= 0) close (wfd[1]);
+ if (rfd[1] >= 0) close (rfd[0]);
}
if (g->pid > 0) kill (g->pid, 9);
if (g->recoverypid > 0) kill (g->recoverypid, 9);
if (g->pid > 0) waitpid (g->pid, NULL, 0);
if (g->recoverypid > 0) waitpid (g->recoverypid, NULL, 0);
+ if (g->fd[0] >= 0) close (g->fd[0]);
+ if (g->fd[1] >= 0) close (g->fd[1]);
g->fd[0] = -1;
g->fd[1] = -1;
g->pid = 0;