net: tftp: Fix tftp store address check in store_block()
PATCH 1/1 net: tftp: Fix tftp store address check in store_block()
During testing of qemu-riscv32 with a 2GiB memory configuration, tftp always fails with a error message:
Load address: 0x84000000
Loading: #
TFTP error: trying to overwrite reserved memory...
It turns out the result of 'tftp_load_addr + tftp_load_size' just overflows (0x100000000) and the test logic in store_block() fails. Fix this by adjusting the end address to ULONG_MAX when overflow is detected.
---
net/tftp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/tftp.c +6 -1
@@ -171,8 +171,13 @@ static inline int store_block(int block, uchar *src, unsigned int len)void *ptr;#ifdef CONFIG_LMB +ulong end_addr = tftp_load_addr + tftp_load_size; + +if (!end_addr) + end_addr =ULONG_MAX ; +if (store_addr < tftp_load_addr || - store_addr + len > tftp_load_addr + tftp_load_size) { + store_addr + len > end_addr) {puts ("\nTFTP error: " );puts ("trying to overwrite reserved memory...\n" );return -1 ;
Signature · 1 line
2.7.4
PATCH 1/1 net: tftp: Fix tftp store address check in store_block()
Quoted 8 lines · Bin Meng
During testing of qemu-riscv32 with a 2GiB memory configuration, tftp always fails with a error message:
Load address:
0x84000000
Loading: #
TFTP error: trying to overwrite reserved memory...
Quoted 7 lines
It turns out the result of '
tftp_load_addr+tftp_load_size' just overflows (0x100000000) and the test logic instore_block()fails. Fix this by adjusting the end address toULONG_MAXwhen overflow is detected.Fixes a156c47e39ad ("tftp: prevent overwriting reserved memory")Signe-off-by Bin Meng <[email protected]>
Oops, not sure how this was messed up. Will resend.
Quoted 6 lines
Signed-off-by Bin Meng <[email protected]>---
net/tftp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Regards,
Bin