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

gre: check nil for pullupblock()

Browse source
This commit is contained in:
cinap_lenrek 2016-11-08 22:33:19 +01:00
parent 58fe71b2f5
commit ba38aa8b9d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,6 +300,8 @@ grekick(void *x, Block *bp)
/* make sure the message has a GRE header */ /* make sure the message has a GRE header */
bp = pullupblock(bp, GRE_IPONLY+GRE_IPPLUSGRE); bp = pullupblock(bp, GRE_IPONLY+GRE_IPPLUSGRE);
if(bp == nil)
return;
gre = (GREhdr *)bp->rp; gre = (GREhdr *)bp->rp;
gre->vihl = IP_VER4; gre->vihl = IP_VER4;
@ -528,11 +530,8 @@ greiput(Proto *proto, Ipifc *, Block *bp)
* that when the block is forwarded, devether.c puts the block into * that when the block is forwarded, devether.c puts the block into
* a queue that also uses ->next. Just do not use ->next here! * a queue that also uses ->next. Just do not use ->next here!
*/ */
if(bp->next){ if(bp->next != nil)
len = blocklen(bp); bp = pullupblock(bp, blocklen(bp));
bp = pullupblock(bp, len);
assert(BLEN(bp) == len && bp->next == nil);
}
gre = (GREhdr *)bp->rp; gre = (GREhdr *)bp->rp;
if(BLEN(bp) < sizeof(GREhdr) || gre->proto != IP_GREPROTO){ if(BLEN(bp) < sizeof(GREhdr) || gre->proto != IP_GREPROTO){