kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libdtc: remove duplicate judgments 

There is no need to check the VALID_DTB repeatedly, and can be combined
into one if statement.

Signed-off-by: Jia Xianhua <jiaxianhua@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
Jia Xianhua 2022-09-15 16:47:03 +08:00 committed by David Gibson
parent e37c25677d
commit c6e92108bc
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libfdt/fdt.c
View File

@ -106,7 +106,6 @@ int fdt_check_header(const void *fdt)
} }
hdrsize = fdt_header_size(fdt); hdrsize = fdt_header_size(fdt);
if (!can_assume(VALID_DTB)) { if (!can_assume(VALID_DTB)) {

if ((fdt_totalsize(fdt) < hdrsize) if ((fdt_totalsize(fdt) < hdrsize)
|| (fdt_totalsize(fdt) > INT_MAX)) || (fdt_totalsize(fdt) > INT_MAX))
return -FDT_ERR_TRUNCATED; return -FDT_ERR_TRUNCATED;
@ -115,9 +114,7 @@ int fdt_check_header(const void *fdt)
if (!check_off_(hdrsize, fdt_totalsize(fdt), if (!check_off_(hdrsize, fdt_totalsize(fdt),
fdt_off_mem_rsvmap(fdt))) fdt_off_mem_rsvmap(fdt)))
return -FDT_ERR_TRUNCATED; return -FDT_ERR_TRUNCATED;
}


if (!can_assume(VALID_DTB)) {
/* Bounds check structure block */ /* Bounds check structure block */
if (!can_assume(LATEST) && fdt_version(fdt) < 17) { if (!can_assume(LATEST) && fdt_version(fdt) < 17) {
if (!check_off_(hdrsize, fdt_totalsize(fdt), if (!check_off_(hdrsize, fdt_totalsize(fdt),