mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "lib: fdt: use ULONG_MAX for boundary checks"

Browse source
This commit is contained in:
Linux Build Service Account 2021-09-28 03:37:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0a8ac9e20a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libfdt/fdt.c
View file

@ -14,7 +14,7 @@
#include "libfdt_internal.h" #include "libfdt_internal.h"
#define UINT_MAX (~0U) #define ULONG_MAX (~0UL)
int fdt_check_header(const void *fdt) int fdt_check_header(const void *fdt)
{ {
@ -41,13 +41,13 @@ int fdt_check_header(const void *fdt)
} }
fdt_end = fdt_start + fdt_totalsize(fdt); fdt_end = fdt_start + fdt_totalsize(fdt);
if (((uint64_t)fdt_start + (uint64_t)fdt_off_dt_struct(fdt) + (uint64_t)fdt_size_dt_struct(fdt)) > UINT_MAX) if (((uint64_t)fdt_start + (uint64_t)fdt_off_dt_struct(fdt) + (uint64_t)fdt_size_dt_struct(fdt)) > ULONG_MAX)
return FDT_ERR_BADOFFSET; return FDT_ERR_BADOFFSET;
if ((fdt_start + fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt)) > fdt_end) if ((fdt_start + fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt)) > fdt_end)
return FDT_ERR_BADOFFSET; return FDT_ERR_BADOFFSET;
if (((uint64_t)fdt_start + (uint64_t)fdt_off_dt_strings(fdt) + (uint64_t)fdt_size_dt_strings(fdt)) > UINT_MAX) if (((uint64_t)fdt_start + (uint64_t)fdt_off_dt_strings(fdt) + (uint64_t)fdt_size_dt_strings(fdt)) > ULONG_MAX)
return FDT_ERR_BADOFFSET; return FDT_ERR_BADOFFSET;
if ((fdt_start + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)) > fdt_end) if ((fdt_start + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)) > fdt_end)