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

wpa: fix error reporting for getptk(), use readn() to read ifstats file

Browse source
This commit is contained in:
cinap_lenrek 2013-06-24 17:19:10 +02:00
parent a3b35c224b
commit 745be8ad8e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/cmd/aux/wpa.c
View file

@ -130,7 +130,7 @@ getifstats(char *key, char *val, int nval)
snprint(buf, sizeof(buf), "%s/ifstats", devdir);
if((fd = open(buf, OREAD)) < 0)
return nil;
n = read(fd, buf, sizeof(buf)-1);
n = readn(fd, buf, sizeof(buf)-1);
close(fd);
if(n <= 0)
return nil;
@ -330,8 +330,10 @@ getptk( uchar smac[Eaddrlen], uchar amac[Eaddrlen],
goto out;
if((ret = auth_rpc(rpc, "read", nil, 0)) != ARok)
goto out;
if(rpc->narg != PTKlen)
if(rpc->narg != PTKlen){
ret = -1;
goto out;
}
memmove(ptk, rpc->arg, PTKlen);
ret = 0;
out:
@ -698,9 +700,9 @@ main(int argc, char *argv[])
memmove(anonce, kd->nonce, sizeof(anonce));
genrandom(snonce, sizeof(snonce));
if(getptk(smac, amac, snonce, anonce, ptk) < 0){
if(getptk(smac, amac, snonce, anonce, ptk) != 0){
if(debug != 0)
fprint(2, "getptk: %r");
fprint(2, "getptk: %r\n");
continue;
}