mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-26 03:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS: drop in flight packets from the tcpip mailbox if PPP session is down

Browse Source 
A previous call to ppp_input might have disconnected the session while
there were still packets in flight in the tcpip mailbox. Drop incoming
packets because ppp_input must never be called if the upper layer is
down.
This commit is contained in:
Sylvain Rochet 2020-10-22 22:52:10 +02:00
parent a9f19cd7f1
commit a494b990da
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -779,8 +779,10 @@ void ppp_link_end(ppp_pcb *pcb) {
void ppp_input(ppp_pcb *pcb, struct pbuf *pb) { void ppp_input(ppp_pcb *pcb, struct pbuf *pb) {
u16_t protocol; u16_t protocol;
#if PPP_DEBUG && PPP_PROTOCOLNAME #if PPP_DEBUG && PPP_PROTOCOLNAME
const char *pname; const char *pname;
#endif /* PPP_DEBUG && PPP_PROTOCOLNAME */ #endif /* PPP_DEBUG && PPP_PROTOCOLNAME */
LWIP_ASSERT("pcb->phase >= PPP_PHASE_ESTABLISH && pcb->phase <= PPP_PHASE_TERMINATE",
pcb->phase >= PPP_PHASE_ESTABLISH && pcb->phase <= PPP_PHASE_TERMINATE);
magic_randomize(); magic_randomize();

11
src/netif/ppp/pppos.c
View File

@ -744,6 +744,7 @@ pppos_input(ppp_pcb *ppp, const void *s, int l)
static void pppos_input_callback(void *arg) { static void pppos_input_callback(void *arg) {
struct pbuf *pb = (struct pbuf*)arg; struct pbuf *pb = (struct pbuf*)arg;
ppp_pcb *ppp; ppp_pcb *ppp;
pppos_pcb *pppos;
ppp = ((struct pppos_input_header*)pb->payload)->ppp; ppp = ((struct pppos_input_header*)pb->payload)->ppp;
if(pbuf_remove_header(pb, sizeof(struct pppos_input_header))) { if(pbuf_remove_header(pb, sizeof(struct pppos_input_header))) {
@ -751,6 +752,16 @@ static void pppos_input_callback(void *arg) {
goto drop; goto drop;
} }
/* A previous call to ppp_input might have disconnected the session
* while there were still packets in flight in the tcpip mailbox.
* Drop incoming packets because ppp_input must never be called if
* the upper layer is down.
*/
pppos = (pppos_pcb *)ppp->link_ctx_cb;
if (!pppos->open) {
goto drop;
}
/* Dispatch the packet thereby consuming it. */ /* Dispatch the packet thereby consuming it. */
ppp_input(ppp, pb); ppp_input(ppp, pb);
return; return;