mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, L2TP, minor fixes

Browse Source 
Check tot_len for ZLB instead of len, it might happens we are just
between 2 pbuf, although almost impossible.

Check buffer is at least 2 byte long before checking address & flags
header.
This commit is contained in:
Sylvain Rochet 2015-04-22 00:50:08 +02:00
parent 15cc47334e
commit 5e43e2d333
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/netif/ppp/pppol2tp.c
View File

@ -475,10 +475,12 @@ static void pppol2tp_input(void *arg, struct udp_pcb *pcb, struct pbuf *p, const
* RFC 2661 does not specify whether the PPP frame in the L2TP payload should * RFC 2661 does not specify whether the PPP frame in the L2TP payload should
* have a HDLC header or not. We handle both cases for compatibility. * have a HDLC header or not. We handle both cases for compatibility.
*/ */
if (p->len >= 2) {
GETSHORT(hflags, inp); GETSHORT(hflags, inp);
if (hflags == 0xff03) { if (hflags == 0xff03) {
pbuf_header(p, -(s16_t)2); pbuf_header(p, -(s16_t)2);
} }
}
/* Dispatch the packet thereby consuming it. */ /* Dispatch the packet thereby consuming it. */
ppp_input(l2tp->ppp, p); ppp_input(l2tp->ppp, p);
return; return;
@ -510,7 +512,7 @@ static void pppol2tp_dispatch_control_packet(pppol2tp_pcb *l2tp, u16_t port, str
} }
/* ZLB packets */ /* ZLB packets */
if (p->len == 0) { if (p->tot_len == 0) {
return; return;
} }