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

fix parseip() error handling in ipconfig, ppp, tftpfs and dns

Browse source
This commit is contained in:
cinap_lenrek 2018-04-17 01:34:10 +02:00
parent 48d117ed64
commit 94018b2130
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/ip/ipconfig/main.c
View file

@ -1715,7 +1715,8 @@ putndb(void)
uchar ip[IPaddrlen]; uchar ip[IPaddrlen];
if((nt = ndbfindattr(t, t, "ip")) == nil if((nt = ndbfindattr(t, t, "ip")) == nil
|| parseip(ip, nt->val) < 0 || ipcmp(ip, conf.laddr) != 0){ || parseip(ip, nt->val) == -1
|| ipcmp(ip, conf.laddr) != 0){
p = seprint(p, e, "\n"); p = seprint(p, e, "\n");
for(nt = t; nt != nil; nt = nt->entry) for(nt = t; nt != nil; nt = nt->entry)
p = seprint(p, e, "%s=%s%s", nt->attr, nt->val, p = seprint(p, e, "%s=%s%s", nt->attr, nt->val,
@ -1837,7 +1838,7 @@ ndbconfig(void)
ok = parseip(conf.fs+IPaddrlen*nfs++, nt->val); ok = parseip(conf.fs+IPaddrlen*nfs++, nt->val);
else if(nauth < sizeof(conf.auth)/IPaddrlen && strcmp(nt->attr, "auth") == 0) else if(nauth < sizeof(conf.auth)/IPaddrlen && strcmp(nt->attr, "auth") == 0)
ok = parseip(conf.auth+IPaddrlen*nauth++, nt->val); ok = parseip(conf.auth+IPaddrlen*nauth++, nt->val);
if (!ok) if(ok == -1)
fprint(2, "%s: bad %s address in ndb: %s\n", argv0, fprint(2, "%s: bad %s address in ndb: %s\n", argv0,
nt->attr, nt->val); nt->attr, nt->val);
} }

3
sys/src/cmd/ip/ppp/ppp.c
View file

@ -2901,7 +2901,8 @@ putndb(PPP *ppp, char *net)
uchar ip[IPaddrlen]; uchar ip[IPaddrlen];
if((nt = ndbfindattr(t, t, "ip")) == nil if((nt = ndbfindattr(t, t, "ip")) == nil
|| parseip(ip, nt->val) < 0 || ipcmp(ip, ppp->local) != 0){ || parseip(ip, nt->val) == -1
|| ipcmp(ip, ppp->local) != 0){
p = seprint(p, e, "\n"); p = seprint(p, e, "\n");
for(nt = t; nt != nil; nt = nt->entry) for(nt = t; nt != nil; nt = nt->entry)
p = seprint(p, e, "%s=%s%s", nt->attr, nt->val, p = seprint(p, e, "%s=%s%s", nt->attr, nt->val,

4
sys/src/cmd/ip/tftpfs.c
View file

@ -295,7 +295,7 @@ fsattach(Req *r)
if(r->ifcall.aname && r->ifcall.aname[0]){ if(r->ifcall.aname && r->ifcall.aname[0]){
uchar addr[IPaddrlen]; uchar addr[IPaddrlen];
if(parseip(addr, r->ifcall.aname) < 0){ if(parseip(addr, r->ifcall.aname) == -1){
respond(r, "bad ip specified"); respond(r, "bad ip specified");
return; return;
} }
@ -459,7 +459,7 @@ threadmain(int argc, char **argv)
case 0: case 0:
break; break;
case 1: case 1:
if(parseip(ipaddr, *argv) < 0) if(parseip(ipaddr, *argv) == -1)
usage(); usage();
break; break;
default: default:

2
sys/src/cmd/ndb/dnudpserver.c
View file

@ -80,7 +80,7 @@ addforwtarg(char *host)
return -1; return -1;
} }
tp = forwtarg + forwtcount; tp = forwtarg + forwtcount;
if (parseip(tp->addr, host) < 0) { if(parseip(tp->addr, host) == -1) {
dnslog("can't parse ip %s", host); dnslog("can't parse ip %s", host);
return -1; return -1;
} }