From: Ley Foon Tan <ley.foon.tan@intel.com>
Date: Tue, 25 Aug 2020 02:26:37 +0000 (+0800)
Subject: net: tftp: Fix load_block offset calculation
X-Git-Tag: v2025.01-rc5-pxa1908~2192^2~6^2~6
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=f6a158b996b3abee4e6315b29a488398cb3946df;p=u-boot.git

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 <ley.foon.tan@intel.com>
Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
---

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);