xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

exportfs: fix more filedescriptor leaks

Browse source 
just closing the pipe isnt enough, we have to
close all remaining file descriptors except sfd
before executing sub exportfs.
This commit is contained in:
cinap_lenrek 2013-10-07 23:18:37 +02:00
parent 6197758ec1
commit ad1111cb3e
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sys/src/cmd/exportfs/exportsrv.c
View file

@ -578,8 +578,9 @@ flushme:
int int
openmount(int sfd) openmount(int sfd)
{ {
int p[2]; int p[2], fd, i, n;
char *arg[10], fdbuf[20], mbuf[20]; char *arg[10], fdbuf[20], mbuf[20];
Dir *dir;
if(pipe(p) < 0) if(pipe(p) < 0)
return -1; return -1;
@ -601,8 +602,19 @@ openmount(int sfd)
dup(p[0], 0); dup(p[0], 0);
dup(p[0], 1); dup(p[0], 1);
close(p[0]);
close(p[1]); /* close all remaining file descriptors except sfd */
if((fd = open("/fd", OREAD)) < 0)
_exits("open /fd failed");
n = dirreadall(fd, &dir);
for(i=0; i<n; i++){
if(strstr(dir[i].name, "ctl"))
continue;
fd = atoi(dir[i].name);
if(fd > 2 && fd != sfd)
close(fd);
}
free(dir);
arg[0] = "exportfs"; arg[0] = "exportfs";
snprint(fdbuf, sizeof fdbuf, "-S/fd/%d", sfd); snprint(fdbuf, sizeof fdbuf, "-S/fd/%d", sfd);