abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-05 14:04:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

ip4_reass: free datagram entry if p == NULL

Browse Source
This commit is contained in:
goldsimon 2018-02-18 08:55:11 +01:00
parent 5b459c1282
commit b5448a86fd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/ipv4/ip4_frag.c
View File

@ -590,14 +590,14 @@ ip4_reass(struct pbuf *p)
u16_t datagram_len = (u16_t)(offset + len); u16_t datagram_len = (u16_t)(offset + len);
if ((datagram_len < offset) || (datagram_len > (0xFFFF - IP_HLEN))) { if ((datagram_len < offset) || (datagram_len > (0xFFFF - IP_HLEN))) {
/* u16_t overflow, cannot handle this */ /* u16_t overflow, cannot handle this */
goto nullreturn; goto nullreturn_ipr;
} }
} }
/* find the right place to insert this pbuf */ /* find the right place to insert this pbuf */
/* @todo: trim pbufs if fragments are overlapping */ /* @todo: trim pbufs if fragments are overlapping */
valid = ip_reass_chain_frag_into_datagram_and_validate(ipr, p, is_last); valid = ip_reass_chain_frag_into_datagram_and_validate(ipr, p, is_last);
if (valid == IP_REASS_VALIDATE_PBUF_DROPPED) { if (valid == IP_REASS_VALIDATE_PBUF_DROPPED) {
goto nullreturn; goto nullreturn_ipr;
} }
/* if we come here, the pbuf has been enqueued */ /* if we come here, the pbuf has been enqueued */
@ -676,6 +676,13 @@ ip4_reass(struct pbuf *p)
LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass_pbufcount: %d out\n", ip_reass_pbufcount)); LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass_pbufcount: %d out\n", ip_reass_pbufcount));
return NULL; return NULL;
nullreturn_ipr:
if ((ipr != NULL) && (ipr->p == NULL)) {
/* dropped pbuf after creating a new datagram entry: remove the entry, too */
LWIP_ASSERT("not firstalthough just enqueued", ipr == reassdatagrams);
ip_reass_dequeue_datagram(ipr, NULL);
}
nullreturn: nullreturn:
LWIP_DEBUGF(IP_REASS_DEBUG, ("ip4_reass: nullreturn\n")); LWIP_DEBUGF(IP_REASS_DEBUG, ("ip4_reass: nullreturn\n"));
IPFRAG_STATS_INC(ip_frag.drop); IPFRAG_STATS_INC(ip_frag.drop);