GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-21 06:01:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kwbimage: Fix out of bounds access

Browse source 
The kwbimage format is reading beyond its header structure if it
misdetects a Xilinx Zynq image and tries to read it. Fix it by
sanity checking that the header we want to read fits inside our
file size.

Signed-off-by: Alexander Graf <agraf@suse.de>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Alexander Graf 2018-03-15 11:14:19 +01:00 • committed by Stefan Roese
parent bc8cb152d8
commit 6cd5678c45
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/kwbimage.c
View file

@ -1616,6 +1616,10 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
struct image_tool_params *params) struct image_tool_params *params)
{ {
uint8_t checksum; uint8_t checksum;
size_t header_size = kwbimage_header_size(ptr);
if (header_size > image_size)
return -FDT_ERR_BADSTRUCTURE;
if (!main_hdr_checksum_ok(ptr)) if (!main_hdr_checksum_ok(ptr))
return -FDT_ERR_BADSTRUCTURE; return -FDT_ERR_BADSTRUCTURE;