External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVZ: drop fd leackage

Browse Source 
Drop unused (and unclosed) errfd and close outfd on exit. Otherwise
polling the running domains with virt-manager let's us quickly run out
of fds.
This commit is contained in:
Guido Günther 2010-12-01 17:43:46 +01:00
parent 401979a454
commit fab5a25c03
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/openvz/openvz_driver.c
View File

@ -1387,17 +1387,17 @@ static int openvzListDomains(virConnectPtr conn ATTRIBUTE_UNUSED,
int veid; int veid;
pid_t pid; pid_t pid;
int outfd = -1; int outfd = -1;
int errfd = -1;
int ret; int ret;
char buf[32]; char buf[32];
char *endptr; char *endptr;
const char *cmd[] = {VZLIST, "-ovpsid", "-H" , NULL}; const char *cmd[] = {VZLIST, "-ovpsid", "-H" , NULL};
ret = virExec(cmd, NULL, NULL, ret = virExec(cmd, NULL, NULL,
&pid, -1, &outfd, &errfd, VIR_EXEC_NONE); &pid, -1, &outfd, NULL, VIR_EXEC_NONE);
if (ret == -1) { if (ret == -1) {
openvzError(VIR_ERR_INTERNAL_ERROR, openvzError(VIR_ERR_INTERNAL_ERROR,
_("Could not exec %s"), VZLIST); _("Could not exec %s"), VZLIST);
VIR_FORCE_CLOSE(outfd);
return -1; return -1;
} }
@ -1415,6 +1415,10 @@ static int openvzListDomains(virConnectPtr conn ATTRIBUTE_UNUSED,
} }
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
if (VIR_CLOSE(outfd) < 0) {
virReportSystemError(errno, "%s", _("failed to close file"));
return -1;
}
return got; return got;
} }
@ -1432,7 +1436,7 @@ static int openvzNumDomains(virConnectPtr conn) {
static int openvzListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, static int openvzListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED,
char **const names, int nnames) { char **const names, int nnames) {
int got = 0; int got = 0;
int veid, outfd = -1, errfd = -1, ret; int veid, outfd = -1, ret;
pid_t pid; pid_t pid;
char vpsname[32]; char vpsname[32];
char buf[32]; char buf[32];
@ -1441,11 +1445,11 @@ static int openvzListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED,
/* the -S options lists only stopped domains */ /* the -S options lists only stopped domains */
ret = virExec(cmd, NULL, NULL, ret = virExec(cmd, NULL, NULL,
&pid, -1, &outfd, &errfd, VIR_EXEC_NONE); &pid, -1, &outfd, NULL, VIR_EXEC_NONE);
if (ret == -1) { if (ret == -1) {
openvzError(VIR_ERR_INTERNAL_ERROR, openvzError(VIR_ERR_INTERNAL_ERROR,
_("Could not exec %s"), VZLIST); _("Could not exec %s"), VZLIST);
return -1; goto out;
} }
while (got < nnames) { while (got < nnames) {
@ -1459,14 +1463,19 @@ static int openvzListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED,
} }
snprintf(vpsname, sizeof(vpsname), "%d", veid); snprintf(vpsname, sizeof(vpsname), "%d", veid);
if (!(names[got] = strdup(vpsname))) if (!(names[got] = strdup(vpsname)))
goto no_memory; virReportOOMError();
goto out;
got ++; got ++;
} }
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
if (VIR_CLOSE(outfd) < 0) {
virReportSystemError(errno, "%s", _("failed to close file"));
goto out;
}
return got; return got;
no_memory: out:
virReportOOMError(); VIR_FORCE_CLOSE(outfd);
for ( ; got >= 0 ; got--) for ( ; got >= 0 ; got--)
VIR_FREE(names[got]); VIR_FREE(names[got]);
return -1; return -1;