mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-28 23:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ip4_reass: fixed bug #51597 (Last fragment is assumed to have arrived even if it was discarded)

Browse Source 
(cherry picked from commit 3dedfa3d1f)

# Conflicts:
#	src/core/ipv4/ip4_frag.c
This commit is contained in:
goldsimon 2017-07-28 09:46:56 +02:00
parent 737ed228c9
commit a2ac9b045a
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,10 +337,11 @@ ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev)
* fragment was received at least once). * fragment was received at least once).
* @param ipr points to the reassembly state * @param ipr points to the reassembly state
* @param new_p points to the pbuf for the current fragment * @param new_p points to the pbuf for the current fragment
* @param is_last is 1 if this pbuf has MF==0 (ipr->flags not updated yet)
* @return see IP_REASS_VALIDATE_* defines * @return see IP_REASS_VALIDATE_* defines
*/ */
static int static int
ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct pbuf *new_p) ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct pbuf *new_p, int is_last)
{ {
struct ip_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL; struct ip_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL;
struct pbuf *q; struct pbuf *q;
@ -430,7 +431,7 @@ ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct
/* At this point, the validation part begins: */ /* At this point, the validation part begins: */
/* If we already received the last fragment */ /* If we already received the last fragment */
if ((ipr->flags & IP_REASS_FLAG_LASTFRAG) != 0) { if (is_last || ((ipr->flags & IP_REASS_FLAG_LASTFRAG) != 0)) {
/* and had no holes so far */ /* and had no holes so far */
if (valid) { if (valid) {
/* then check if the rest of the fragments is here */ /* then check if the rest of the fragments is here */
@ -458,8 +459,6 @@ ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct
((struct ip_reass_helper*)ipr->p->payload) != iprh); ((struct ip_reass_helper*)ipr->p->payload) != iprh);
LWIP_ASSERT("validate_datagram:next_pbuf!=NULL", LWIP_ASSERT("validate_datagram:next_pbuf!=NULL",
iprh->next_pbuf == NULL); iprh->next_pbuf == NULL);
LWIP_ASSERT("validate_datagram:datagram end!=datagram len",
iprh->end == ipr->datagram_len);
} }
} }
} }
@ -493,6 +492,7 @@ ip4_reass(struct pbuf *p)
struct ip_reass_helper *iprh; struct ip_reass_helper *iprh;
u16_t offset, len, clen; u16_t offset, len, clen;
int valid; int valid;
int is_last;
IPFRAG_STATS_INC(ip_frag.recv); IPFRAG_STATS_INC(ip_frag.recv);
MIB2_STATS_INC(mib2.ipreasmreqds); MIB2_STATS_INC(mib2.ipreasmreqds);
@ -562,16 +562,17 @@ ip4_reass(struct pbuf *p)
* to an existing one */ * to an existing one */
/* check for 'no more fragments', and update queue entry*/ /* check for 'no more fragments', and update queue entry*/
if ((IPH_OFFSET(fraghdr) & PP_NTOHS(IP_MF)) == 0) { is_last = (IPH_OFFSET(fraghdr) & PP_NTOHS(IP_MF)) == 0;
ipr->flags |= IP_REASS_FLAG_LASTFRAG; if (is_last) {
ipr->datagram_len = offset + len; u16_t datagram_len = (u16_t)(offset + len);
LWIP_DEBUGF(IP_REASS_DEBUG, if ((datagram_len < offset) || (datagram_len > (0xFFFF - IP_HLEN))) {
("ip4_reass: last fragment seen, total len %"S16_F"\n", /* u16_t overflow, cannot handle this */
ipr->datagram_len)); goto nullreturn;
}
} }
/* 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); 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;
} }
@ -581,6 +582,14 @@ ip4_reass(struct pbuf *p)
the number of fragments that may be enqueued at any one time the number of fragments that may be enqueued at any one time
(overflow checked by testing against IP_REASS_MAX_PBUFS) */ (overflow checked by testing against IP_REASS_MAX_PBUFS) */
ip_reass_pbufcount = (u16_t)(ip_reass_pbufcount + clen); ip_reass_pbufcount = (u16_t)(ip_reass_pbufcount + clen);
if (is_last) {
u16_t datagram_len = (u16_t)(offset + len);
ipr->datagram_len = datagram_len;
ipr->flags |= IP_REASS_FLAG_LASTFRAG;
LWIP_DEBUGF(IP_REASS_DEBUG,
("ip4_reass: last fragment seen, total len %"S16_F"\n",
ipr->datagram_len));
}
if (valid == IP_REASS_VALIDATE_TELEGRAM_FINISHED) { if (valid == IP_REASS_VALIDATE_TELEGRAM_FINISHED) {
struct ip_reassdata *ipr_prev; struct ip_reassdata *ipr_prev;