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

devip: fix router adv/sol options validation (options padded to 8 bytes)

Browse source
This commit is contained in:
cinap_lenrek 2018-08-27 20:58:48 +02:00
parent cff1ab5fdf
commit 5c945a0b48
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sys/src/9/ip/icmp6.c
View file

@ -617,7 +617,7 @@ valid(Proto *icmp, Ipifc *ifc, Block *bp, Icmppriv6 *ipriv)
goto err; goto err;
} }
sz = IPICMPSZ + 8; sz = IPICMPSZ + 8;
while (sz+1 < pktsz) { while (sz+8 <= pktsz) {
osz = packet[sz+1]; osz = packet[sz+1];
if(osz <= 0) { if(osz <= 0) {
ipriv->stats[OptlenErrs6]++; ipriv->stats[OptlenErrs6]++;
@ -634,7 +634,7 @@ valid(Proto *icmp, Ipifc *ifc, Block *bp, Icmppriv6 *ipriv)
} }
unsp = (ipcmp(p->src, v6Unspecified) == 0); unsp = (ipcmp(p->src, v6Unspecified) == 0);
sz = IPICMPSZ + 8; sz = IPICMPSZ + 8;
while (sz+1 < pktsz) { while (sz+8 <= pktsz) {
osz = packet[sz+1]; osz = packet[sz+1];
if(osz <= 0 || if(osz <= 0 ||
(unsp && packet[sz] == SRC_LLADDR)) { (unsp && packet[sz] == SRC_LLADDR)) {