mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
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: Stephane Fillod <stephane.fillod@grassvalley.com> Acked-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
parent
1f241263e0
commit
e397e59e86
1 changed files with 2 additions and 1 deletions
|
@ -1201,7 +1201,8 @@ static IP_t *__NetDefragment(IP_t *ip, int *lenp)
|
||||||
h = payload + h->next_hole;
|
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?) */
|
/* no overlap with holes (dup fragment?) */
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue