From f6a158b996b3abee4e6315b29a488398cb3946df Mon Sep 17 00:00:00 2001 From: Ley Foon Tan Date: Tue, 25 Aug 2020 10:26:37 +0800 Subject: [PATCH] net: tftp: Fix load_block offset calculation 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 Reviewed-By: Ramon Fried --- net/tftp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index 1c003871c1..6fdb1a821a 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -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);