mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
ofnode: NULL check bootscr_flash_size before dereference
Move the NULL check of bootscr_flash_size to before the first time it is dereferenced to avoid any possible segment violations. This issue found by Smatch. Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
committed by
Tom Rini
parent
5f70be08b0
commit
cd79a2839b
@@ -1961,6 +1961,12 @@ int ofnode_read_bootscript_flash(u64 *bootscr_flash_offset,
|
||||
ofnode uboot;
|
||||
|
||||
*bootscr_flash_offset = 0;
|
||||
|
||||
if (!bootscr_flash_size) {
|
||||
dm_warn("bootscr-flash-size is zero. Ignoring properties!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
*bootscr_flash_size = 0;
|
||||
|
||||
uboot = ofnode_path("/options/u-boot");
|
||||
@@ -1979,12 +1985,6 @@ int ofnode_read_bootscript_flash(u64 *bootscr_flash_offset,
|
||||
if (ret)
|
||||
return -EINVAL;
|
||||
|
||||
if (!bootscr_flash_size) {
|
||||
dm_warn("bootscr-flash-size is zero. Ignoring properties!\n");
|
||||
*bootscr_flash_offset = 0;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user