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

ip: fix memory leak in ipicadd6()

Browse source 
allocate the Iplifc structure on the stack instead.
i assuming that it was allocated on heap in fear of
causing stack oveflow. on 386, this adds arround
88 bytes on the stack but it doesnt seem to cause
any trouble. (checked with poolcheck after ctl write)
This commit is contained in:
cinap_lenrek 2014-08-21 00:30:13 +02:00
parent 0d5491fb08
commit 2ec9006e9e
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sys/src/9/ip/ipifc.c
View file

@ -1628,25 +1628,29 @@ char*
ipifcadd6(Ipifc *ifc, char**argv, int argc) ipifcadd6(Ipifc *ifc, char**argv, int argc)
{ {
int plen = 64; int plen = 64;
long origint = NOW / 1000, preflt = ~0L, validlt = ~0L;
char addr[40], preflen[6]; char addr[40], preflen[6];
char *params[3]; char *params[3];
uchar autoflag = 1, onlink = 1;
uchar prefix[IPaddrlen]; uchar prefix[IPaddrlen];
Iplifc *lifc; Iplifc lifc;
lifc.onlink = 1;
lifc.autoflag = 1;
lifc.validlt = ~0L;
lifc.preflt = ~0L;
lifc.origint = NOW / 1000;
switch(argc) { switch(argc) {
case 7: case 7:
preflt = atoi(argv[6]); lifc.preflt = atoi(argv[6]);
/* fall through */ /* fall through */
case 6: case 6:
validlt = atoi(argv[5]); lifc.validlt = atoi(argv[5]);
/* fall through */ /* fall through */
case 5: case 5:
autoflag = atoi(argv[4]); lifc.autoflag = atoi(argv[4]) != 0;
/* fall through */ /* fall through */
case 4: case 4:
onlink = atoi(argv[3]); lifc.onlink = atoi(argv[3]) != 0;
/* fall through */ /* fall through */
case 3: case 3:
plen = atoi(argv[2]); plen = atoi(argv[2]);
@ -1657,26 +1661,20 @@ ipifcadd6(Ipifc *ifc, char**argv, int argc)
return Ebadarg; return Ebadarg;
} }
if (parseip(prefix, argv[1]) != 6 || validlt < preflt || plen < 0 || if (parseip(prefix, argv[1]) != 6 || lifc.validlt < lifc.preflt || plen < 0 ||
plen > 64 || islinklocal(prefix)) plen > 64 || islinklocal(prefix))
return Ebadarg; return Ebadarg;
lifc = smalloc(sizeof(Iplifc));
lifc->onlink = (onlink != 0);
lifc->autoflag = (autoflag != 0);
lifc->validlt = validlt;
lifc->preflt = preflt;
lifc->origint = origint;
/* issue "add" ctl msg for v6 link-local addr and prefix len */ /* issue "add" ctl msg for v6 link-local addr and prefix len */
if(ifc->m->pref2addr == nil) if(ifc->m->pref2addr == nil)
return Ebadarg; return Ebadarg;
(*ifc->m->pref2addr)(prefix, ifc->mac); /* mac → v6 link-local addr */ (*ifc->m->pref2addr)(prefix, ifc->mac); /* mac → v6 link-local addr */
sprint(addr, "%I", prefix); sprint(addr, "%I", prefix);
sprint(preflen, "/%d", plen); sprint(preflen, "/%d", plen);
params[0] = "add"; params[0] = "add";
params[1] = addr; params[1] = addr;
params[2] = preflen; params[2] = preflen;
return ipifcadd(ifc, params, 3, 0, lifc); return ipifcadd(ifc, params, 3, 0, &lifc);
} }