Skip to content
Snippets Groups Projects
Commit e397e59e authored by Fillod Stephane's avatar Fillod Stephane Committed by Ben Warren
Browse files

ip/defrag: fix processing of last short fragment


TFTP'ing a file of size 1747851 bytes with CONFIG_IP_DEFRAG and
CONFIG_TFTP_BLOCKSIZE set to 4096 fails with a timeout, because
the last fragment is not taken into account. This patch fixes
IP fragments having less than 8 bytes of payload.

Signed-off-by: default avatarStephane Fillod <stephane.fillod@grassvalley.com>
Acked-by: default avatarAlessandro Rubini <rubini@gnudd.com>
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 1f241263
Branches
Tags
No related merge requests found
......@@ -1201,7 +1201,8 @@ static IP_t *__NetDefragment(IP_t *ip, int *lenp)
h = payload + h->next_hole;
}
if (offset8 + (len / 8) <= h - payload) {
/* last fragment may be 1..7 bytes, the "+7" forces acceptance */
if (offset8 + ((len + 7) / 8) <= h - payload) {
/* no overlap with holes (dup fragment?) */
return NULL;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment