shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

boot: Fix overflow check for FDT_PROP in devicetree_get_compatible

Browse Source
This commit is contained in:
anonymix007 2024-11-06 23:03:12 +03:00
parent f935dd74c6
commit 145479f4d0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/boot/devicetree.c
View File

@ -131,6 +131,7 @@ static const char* devicetree_get_compatible(const void *dtb) {
if (struct_off % sizeof(uint32_t) != 0)
return NULL;
if (struct_size % sizeof(uint32_t) != 0 ||
!ADD_SAFE(&end, struct_off, struct_size) ||
end > strings_off)
@ -150,7 +151,7 @@ static const char* devicetree_get_compatible(const void *dtb) {
break;
case FDT_PROP:
/* At least 3 words should present: len, name_off, c (nul-terminated string always has non-zero length) */
if (i + 3 >= size_words || cursor[++i] != 0)
if (i + 3 >= size_words)
return NULL;
len = be32toh(cursor[++i]);
name_off = be32toh(cursor[++i]);