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

ip: fix assert panic on fragmented icmp echo request (see eriks icmp-frag patch)

Browse source
This commit is contained in:
cinap_lenrek 2012-08-02 02:02:10 +02:00
parent 4971432577
commit 1159f1e54f
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/ip/icmp.c
View file

@ -366,7 +366,7 @@ icmpiput(Proto *icmp, Ipifc*, Block *bp)
case EchoRequest: case EchoRequest:
if (iplen < n) if (iplen < n)
bp = trimblock(bp, 0, iplen); bp = trimblock(bp, 0, iplen);
r = mkechoreply(bp); r = mkechoreply(concatblock(bp));
ipriv->out[EchoReply]++; ipriv->out[EchoReply]++;
ipoput4(icmp->f, r, 0, MAXTTL, DFLTTOS, nil); ipoput4(icmp->f, r, 0, MAXTTL, DFLTTOS, nil);
break; break;

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

@ -734,7 +734,7 @@ icmpiput6(Proto *icmp, Ipifc *ipifc, Block *bp)
switch(p->type) { switch(p->type) {
case EchoRequestV6: case EchoRequestV6:
r = mkechoreply6(bp, ipifc); r = mkechoreply6(concatblock(bp), ipifc);
if(r == nil) if(r == nil)
goto raise; goto raise;
ipriv->out[EchoReply]++; ipriv->out[EchoReply]++;

1
sys/src/9/ip/ip.c
View file

@ -208,7 +208,6 @@ ipoput4(Fs *f, Block *bp, int gating, int ttl, int tos, Conv *c)
eh->cksum[0] = 0; eh->cksum[0] = 0;
eh->cksum[1] = 0; eh->cksum[1] = 0;
hnputs(eh->cksum, ipcsum(&eh->vihl)); hnputs(eh->cksum, ipcsum(&eh->vihl));
assert(bp->next == nil);
ifc->m->bwrite(ifc, bp, V4, gate); ifc->m->bwrite(ifc, bp, V4, gate);
runlock(ifc); runlock(ifc);
poperror(); poperror();