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

vircommand: Separate mass FD closing into a function

Browse Source 
I will optimize this code a bit in the next commit. But for that
it is better if the code lives in a separate function.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2019-07-02 08:27:25 +02:00
parent cc34260f5a
commit c1a9bfbbba
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/util/vircommand.c
View File

@ -418,6 +418,37 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups)
return ret; return ret;
} }
static int
virCommandMassClose(virCommandPtr cmd,
int childin,
int childout,
int childerr)
{
int openmax = sysconf(_SC_OPEN_MAX);
int fd;
int tmpfd;
if (openmax < 0) {
virReportSystemError(errno, "%s",
_("sysconf(_SC_OPEN_MAX) failed"));
return -1;
}
for (fd = 3; fd < openmax; fd++) {
if (fd == childin || fd == childout || fd == childerr)
continue;
if (!virCommandFDIsSet(cmd, fd)) {
tmpfd = fd;
VIR_MASS_CLOSE(tmpfd);
} else if (virSetInherit(fd, true) < 0) {
virReportSystemError(errno, _("failed to preserve fd %d"), fd);
return -1;
}
}
return 0;
}
/* /*
* virExec: * virExec:
* @cmd virCommandPtr containing all information about the program to * @cmd virCommandPtr containing all information about the program to
@ -427,13 +458,12 @@ static int
virExec(virCommandPtr cmd) virExec(virCommandPtr cmd)
{ {
pid_t pid; pid_t pid;
int null = -1, fd, openmax; int null = -1;
int pipeout[2] = {-1, -1}; int pipeout[2] = {-1, -1};
int pipeerr[2] = {-1, -1}; int pipeerr[2] = {-1, -1};
int childin = cmd->infd; int childin = cmd->infd;
int childout = -1; int childout = -1;
int childerr = -1; int childerr = -1;
int tmpfd;
VIR_AUTOFREE(char *) binarystr = NULL; VIR_AUTOFREE(char *) binarystr = NULL;
const char *binary = NULL; const char *binary = NULL;
int ret; int ret;
@ -539,23 +569,9 @@ virExec(virCommandPtr cmd)
if (cmd->mask) if (cmd->mask)
umask(cmd->mask); umask(cmd->mask);
ret = EXIT_CANCELED; ret = EXIT_CANCELED;
openmax = sysconf(_SC_OPEN_MAX);
if (openmax < 0) { if (virCommandMassClose(cmd, childin, childout, childerr) < 0)
virReportSystemError(errno, "%s",
_("sysconf(_SC_OPEN_MAX) failed"));
goto fork_error; goto fork_error;
}
for (fd = 3; fd < openmax; fd++) {
if (fd == childin || fd == childout || fd == childerr)
continue;
if (!virCommandFDIsSet(cmd, fd)) {
tmpfd = fd;
VIR_MASS_CLOSE(tmpfd);
} else if (virSetInherit(fd, true) < 0) {
virReportSystemError(errno, _("failed to preserve fd %d"), fd);
goto fork_error;
}
}
if (prepareStdFd(childin, STDIN_FILENO) < 0) { if (prepareStdFd(childin, STDIN_FILENO) < 0) {
virReportSystemError(errno, virReportSystemError(errno,