From: Jayachandran Chandrasekharan Nair <jayachandranc@netlogicmicro.com>
Date: Tue, 10 Jul 2012 06:18:54 +0000 (+0530)
Subject: net: tftp: fix type of block arg to store_block
X-Git-Tag: v2012.10-rc1~415^2~35^2~9^2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bc46dfac2f21756642e549b05689e03db538639f;p=u-boot

net: tftp: fix type of block arg to store_block

The block argument for store_block can be -1 when the tftp sequence
number rolls over (i.e TftpBlock == 0), so the first argument to
store_block has to be of type 'int' instead of 'unsigned'.

In our environment (gcc 4.4.5 mips toolchain), this causes incorrect
'offset' to be generated for storing the block, and the tftp block
with number 0 will be written elsewhere, resulting in a bad block in
the downloaded file and a memory corruption.

Signed-off-by: Jayachandran Chandrasekharan Nair <jayachandranc@netlogicmicro.com>
---

diff --git a/net/tftp.c b/net/tftp.c
index b2e08b4bfb..59a8ebb3cf 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -156,7 +156,7 @@ mcast_cleanup(void)
 #endif	/* CONFIG_MCAST_TFTP */
 
 static inline void
-store_block(unsigned block, uchar *src, unsigned len)
+store_block(int block, uchar *src, unsigned len)
 {
 	ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
 	ulong newsize = offset + len;