TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 02:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UB on dtb

Browse Source 
`operator==` of string_view will create a tmp `string_view`.
It's an UB if the `const char *` is a nullptr.
`fdt_get_name` however will return a nullptr.
This commit is contained in:
LoveSy 2021-11-04 11:53:50 +08:00 committed by John Wu
parent 63f670fc36
commit c91ccc8b4e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/magiskboot/dtb.cpp
View File

@ -82,7 +82,7 @@ static void print_node(const void *fdt, int node = 0, int depth = 0) {
} }
static int find_fstab(const void *fdt, int node = 0) { static int find_fstab(const void *fdt, int node = 0) {
if (fdt_get_name(fdt, node, nullptr) == "fstab"sv) if (auto name = fdt_get_name(fdt, node, nullptr); name && name == "fstab"sv)
return node; return node;
int child; int child;
fdt_for_each_subnode(child, fdt, node) { fdt_for_each_subnode(child, fdt, node) {
@ -142,7 +142,7 @@ static bool dtb_patch(const char *file) {
int node; int node;
// Patch the chosen node for bootargs // Patch the chosen node for bootargs
fdt_for_each_subnode(node, fdt, 0) { fdt_for_each_subnode(node, fdt, 0) {
if (fdt_get_name(fdt, node, nullptr) != "chosen"sv) if (auto name = fdt_get_name(fdt, node, nullptr); !name || name != "chosen"sv)
continue; continue;
int len; int len;
if (auto value = fdt_getprop(fdt, node, "bootargs", &len)) { if (auto value = fdt_getprop(fdt, node, "bootargs", &len)) {