colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vbe: Tidy up error checking with blk_read()

Browse Source 
This function can read fewer blocks than requested, so update the checks
to handle this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-01-15 18:27:13 -07:00
committed by Tom Rini
parent 91f27b5b07
commit d337037e1a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/vbe_common.c
View File

@@ -126,6 +126,8 @@ int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
ret = blk_read(blk, blknum, 1, sbuf); ret = blk_read(blk, blknum, 1, sbuf);
if (ret < 0) if (ret < 0)
return log_msg_ret("rd", ret); return log_msg_ret("rd", ret);
else if (ret != 1)
return log_msg_ret("rd2", -EIO);
ret = fdt_check_header(sbuf); ret = fdt_check_header(sbuf);
if (ret < 0) if (ret < 0)
@@ -214,6 +216,8 @@ int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
blknum, full_size, num_blks, base, base_buf, ret); blknum, full_size, num_blks, base, base_buf, ret);
if (ret < 0) if (ret < 0)
return log_msg_ret("rd", ret); return log_msg_ret("rd", ret);
if (ret != num_blks)
return log_msg_ret("rd", -EIO);
} }
if (load_addrp) if (load_addrp)
*load_addrp = load_addr; *load_addrp = load_addr;