Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 20:34:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

legacy-net: wget: fix wget_info handling after new tcp legacy stack

Browse source 
Check wget_info->buffer_size for overflow and do not clean the wget_info struct
on failure, let the owner of the struct handle the error. The latter is necesary
, e.g., for when a request fails because the provided buffer was too small.

Signed-off-by: Adriano Cordova <adriano.cordova@canonical.com>
This commit is contained in:
Adriano Cordova 2025-03-03 11:13:10 -03:00 • committed by Heinrich Schuchardt
parent 2eda179568
commit 908033ea22
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/wget.c
View file

@ -53,6 +53,9 @@ static inline int store_block(uchar *src, unsigned int offset, unsigned int len)
ulong store_addr = image_load_addr + offset; ulong store_addr = image_load_addr + offset;
uchar *ptr; uchar *ptr;
// Avoid overflow
if (wget_info->buffer_size && wget_info->buffer_size < offset + len)
return -1;
if (CONFIG_IS_ENABLED(LMB) && wget_info->set_bootdev) { if (CONFIG_IS_ENABLED(LMB) && wget_info->set_bootdev) {
if (store_addr < image_load_addr || if (store_addr < image_load_addr ||
lmb_read_check(store_addr, len)) { lmb_read_check(store_addr, len)) {
@ -98,12 +101,6 @@ static void tcp_stream_on_closed(struct tcp_stream *tcp)
net_set_state(wget_loop_state); net_set_state(wget_loop_state);
if (wget_loop_state != NETLOOP_SUCCESS) { if (wget_loop_state != NETLOOP_SUCCESS) {
net_boot_file_size = 0; net_boot_file_size = 0;
if (wget_info->status_code == HTTP_STATUS_OK) {
wget_info->status_code = HTTP_STATUS_BAD;
wget_info->hdr_cont_len = 0;
if (wget_info->headers)
wget_info->headers[0] = 0;
}
printf("\nwget: Transfer Fail, TCP status - %d\n", tcp->status); printf("\nwget: Transfer Fail, TCP status - %d\n", tcp->status);
return; return;
} }
@ -212,6 +209,11 @@ static void tcp_stream_on_rcv_nxt_update(struct tcp_stream *tcp, u32 rx_bytes)
"wget: Connected Len %lu\n", "wget: Connected Len %lu\n",
content_length); content_length);
wget_info->hdr_cont_len = content_length; wget_info->hdr_cont_len = content_length;
if (wget_info->buffer_size && wget_info->buffer_size < wget_info->hdr_cont_len){
tcp_stream_reset(tcp);
goto end;
}
} }
net_boot_file_size = rx_bytes - http_hdr_size; net_boot_file_size = rx_bytes - http_hdr_size;
@ -227,7 +229,9 @@ static int tcp_stream_rx(struct tcp_stream *tcp, u32 rx_offs, void *buf, int len
if ((max_rx_pos == (u32)(-1)) || (max_rx_pos < rx_offs + len - 1)) if ((max_rx_pos == (u32)(-1)) || (max_rx_pos < rx_offs + len - 1))
max_rx_pos = rx_offs + len - 1; max_rx_pos = rx_offs + len - 1;
store_block(buf, rx_offs - http_hdr_size, len); // Avoid overflow
if (store_block(buf, rx_offs - http_hdr_size, len) < 0)
return -1;
return len; return len;
} }