leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: tftp: Fix load_block offset calculation

Browse Source 
When load the last block, the "len" might not be a block size. This cause
loading the incorrect last block data.

The fix change "len" to tftp_block_size and minus one tftp_block_size
for offset calculation.

Use same offset calculation formula as in store_block().

Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Ley Foon Tan 2020-08-25 10:26:37 +08:00 committed by Tom Rini
parent ae0bdf09ca
commit f6a158b996
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/tftp.c
View File

@ -234,7 +234,8 @@ static void new_transfer(void)
static int load_block(unsigned block, uchar *dst, unsigned len)
{
/* We may want to get the final block from the previous set */
ulong offset = ((int)block - 1) * len + tftp_block_wrap_offset;
ulong offset = block * tftp_block_size + tftp_block_wrap_offset -
tftp_block_size;
ulong tosend = len;
tosend = min(net_boot_file_size - offset, tosend);