fdtdec: protect against another NULL phandlep in
From: Heiko Stuebner <heiko@...> Date: Mon, 7 Oct 2019 23:57:18 +0200
Commit-Message
The change adding fdtdec_add_reserved_memory() already protected the added phandle against the phandlep being NULL - making the phandlep var optional. But in the early code checking for an already existing carveout this check was not done and thus the phandle assignment could run into trouble, so add a check there as well, which makes the function still return sucessfully if a matching region is found, even though no-one wants to work with the phandle. Fixes: c9222a08b3f7 ("fdtdec: Implement fdtdec_add_reserved_memory()") Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Statistics
- 2 lines added
- 1 lines removed
Changes
--------------------------------- lib/fdtdec.c ---------------------------------
index 74525c84e7..17455c5506 100644
@@ -1363,7 +1363,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,
}
if (addr == carveout->start && (addr + size) == carveout->end) {
+ if (phandlep)
+ *phandlep = fdt_get_phandle(blob, node);
return 0;
}
}