aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJayachandran Chandrasekharan Nair <jayachandranc@netlogicmicro.com>2012-07-10 11:48:54 +0530
committerJoe Hershberger <joe.hershberger@ni.com>2012-07-11 13:14:16 -0500
commitbc46dfac2f21756642e549b05689e03db538639f (patch)
treea93532c71e061d9257e14aba5c6aebe67ce549ce /net
parent211e47549b668c7cdd8658c0413a272f0d0495d4 (diff)
downloadu-boot-linaro-stable-bc46dfac2f21756642e549b05689e03db538639f.tar.gz
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>
Diffstat (limited to 'net')
-rw-r--r--net/tftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tftp.c b/net/tftp.c
index b2e08b4bf..59a8ebb3c 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;