External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

command: avoid double close bugs

Browse Source 
KAMEZAWA Hiroyuki reported a nasty double-free bug when virCommand
is used to convert a string into input to a child command.  The
problem is that the poll() loop of virCommandProcessIO would close()
the write end of the pipe in order to let the child see EOF, then
the caller virCommandRun() would also close the same fd number, with
the second close possibly nuking an fd opened by some other thread
in the meantime.  This in turn can have all sorts of bad effects.

The bug has been present since the introduction of virCommand in
commit f16ad06f.

This is based on his first attempt at a patch, at
https://bugzilla.redhat.com/show_bug.cgi?id=823716

* src/util/command.c (_virCommand): Drop inpipe member.
(virCommandProcessIO): Add argument, to avoid closing caller's fd
without informing caller.
(virCommandRun, virCommandNewArgs): Adjust clients.
This commit is contained in:
Eric Blake 2012-05-29 17:47:58 -06:00
parent 655cffa0f2
commit da831afcf2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/command.c
View File

@ -83,7 +83,6 @@ struct _virCommand {
char **errbuf;
int infd;
int inpipe;
int outfd;
int errfd;
int *outfdptr;
@ -788,7 +787,6 @@ virCommandNewArgs(const char *const*args)
cmd->handshakeNotify[1] = -1;
cmd->infd = cmd->outfd = cmd->errfd = -1;
cmd->inpipe = -1;
cmd->pid = -1;
virCommandAddArgSet(cmd, args);
@ -1676,7 +1674,7 @@ virCommandTranslateStatus(int status)
* Manage input and output to the child process.
*/
static int
virCommandProcessIO(virCommandPtr cmd)
virCommandProcessIO(virCommandPtr cmd, int *inpipe)
{
int infd = -1, outfd = -1, errfd = -1;
size_t inlen = 0, outlen = 0, errlen = 0;
@ -1687,7 +1685,7 @@ virCommandProcessIO(virCommandPtr cmd)
* via pipe */
if (cmd->inbuf) {
inlen = strlen(cmd->inbuf);
infd = cmd->inpipe;
infd = *inpipe;
}
/* With out/err buffer, the outfd/errfd have been filled with an
@ -1808,10 +1806,9 @@ virCommandProcessIO(virCommandPtr cmd)
} else {
inoff += done;
if (inoff == inlen) {
int tmpfd ATTRIBUTE_UNUSED;
tmpfd = infd;
if (VIR_CLOSE(infd) < 0)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
if (VIR_CLOSE(*inpipe) < 0)
VIR_DEBUG("ignoring failed close on fd %d", infd);
infd = -1;
}
}
}
@ -1938,7 +1935,6 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
return -1;
}
cmd->infd = infd[0];
cmd->inpipe = infd[1];
}
/* If caller requested the same string for stdout and stderr, then
@ -1981,7 +1977,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
}
if (string_io)
ret = virCommandProcessIO(cmd);
ret = virCommandProcessIO(cmd, &infd[1]);
if (virCommandWait(cmd, exitstatus) < 0)
ret = -1;