From 31bc2f9b207eb1d0712065f2f9b971a4e9f63dc4 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Tue, 12 Jun 2018 10:39:46 +0200 Subject: [PATCH] fixed bug #51908: PPPOS uses PBUF_POOL in transmit pathway Signed-off-by: Simon Goldschmidt --- src/netif/ppp/mppe.c | 2 +- src/netif/ppp/pppos.c | 4 ++-- src/netif/ppp/vj.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/netif/ppp/mppe.c b/src/netif/ppp/mppe.c index a6197969..4cca89de 100644 --- a/src/netif/ppp/mppe.c +++ b/src/netif/ppp/mppe.c @@ -201,7 +201,7 @@ mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t proto /* TCP stack requires that we don't change the packet payload, therefore we copy * the whole packet before encryption. */ - np = pbuf_alloc(PBUF_RAW, MPPE_OVHD + sizeof(protocol) + (*pb)->tot_len, PBUF_POOL); + np = pbuf_alloc(PBUF_RAW, MPPE_OVHD + sizeof(protocol) + (*pb)->tot_len, PBUF_RAM); if (!np) { return ERR_MEM; } diff --git a/src/netif/ppp/pppos.c b/src/netif/ppp/pppos.c index 83ccb031..978ddab4 100644 --- a/src/netif/ppp/pppos.c +++ b/src/netif/ppp/pppos.c @@ -208,7 +208,7 @@ pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) LWIP_UNUSED_ARG(ppp); /* Grab an output buffer. */ - nb = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL); + nb = pbuf_alloc(PBUF_RAW, 0, PBUF_RAM); if (nb == NULL) { PPPDEBUG(LOG_WARNING, ("pppos_write[%d]: alloc fail\n", ppp->netif->num)); LINK_STATS_INC(link.memerr); @@ -257,7 +257,7 @@ pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u16_t protocol) LWIP_UNUSED_ARG(ppp); /* Grab an output buffer. */ - nb = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL); + nb = pbuf_alloc(PBUF_RAW, 0, PBUF_RAM); if (nb == NULL) { PPPDEBUG(LOG_WARNING, ("pppos_netif_output[%d]: alloc fail\n", ppp->netif->num)); LINK_STATS_INC(link.memerr); diff --git a/src/netif/ppp/vj.c b/src/netif/ppp/vj.c index 62dbf54d..3fecba69 100644 --- a/src/netif/ppp/vj.c +++ b/src/netif/ppp/vj.c @@ -202,7 +202,7 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf **pb) /* TCP stack requires that we don't change the packet payload, therefore we copy * the whole packet before compression. */ - np = pbuf_clone(PBUF_RAW, PBUF_POOL, *pb); + np = pbuf_clone(PBUF_RAW, PBUF_RAM, *pb); if (!np) { return (TYPE_IP); }