sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system/fastboot: Fix that total_chunks of sparse_header maybe error

Browse Source 
when size of image passed to command "fastboot flash" is not 4KB aligned.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
This commit is contained in:
wangjianyu3 2024-08-05 16:33:55 +08:00 committed by Xiang Xiao
parent a413f6bcac
commit caa47f282e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/fastboot/fastboot.c
View File

@ -362,6 +362,7 @@ static int
fastboot_flash_program(FAR struct fastboot_ctx_s *context, int fd) fastboot_flash_program(FAR struct fastboot_ctx_s *context, int fd)
{ {
FAR char *chunk_ptr = context->download_buffer; FAR char *chunk_ptr = context->download_buffer;
FAR char *end_ptr = chunk_ptr + context->download_size;
FAR struct fastboot_sparse_header_s *sparse; FAR struct fastboot_sparse_header_s *sparse;
uint32_t chunk_num; uint32_t chunk_num;
int ret = OK; int ret = OK;
@ -382,10 +383,9 @@ fastboot_flash_program(FAR struct fastboot_ctx_s *context, int fd)
} }
chunk_num = sparse->total_chunks; chunk_num = sparse->total_chunks;
chunk_ptr += FASTBOOT_SPARSE_HEADER; chunk_ptr += FASTBOOT_SPARSE_HEADER;
while (chunk_num--) while (chunk_ptr < end_ptr && chunk_num--)
{ {
FAR struct fastboot_chunk_header_s *chunk = FAR struct fastboot_chunk_header_s *chunk =
(FAR struct fastboot_chunk_header_s *)chunk_ptr; (FAR struct fastboot_chunk_header_s *)chunk_ptr;