fdtdec: protect against another NULL phandlep in

A patch from »fdtdec: protect against another NULL phandlep in« in state Mainline for u-boot

From: Heiko Stuebner <heiko.stuebner@...> 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 successfully 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.stuebner@...>

Patch-Comment

changes in v2: - add comment about phandlep allowed to be NULL include/fdtdec.h | 1 + lib/fdtdec.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)

Statistics

  • 3 lines added
  • 1 lines removed

Changes

------------------------------- include/fdtdec.h -------------------------------
index 635f53083b..54509a25ad 100644
@@ -1078,6 +1078,7 @@ static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle)
* @param basename base name of the node to create
* @param carveout information about the carveout region
* @param phandlep return location for the phandle of the carveout region
+ * can be NULL
* @return 0 on success or a negative error code on failure
*/
int fdtdec_add_reserved_memory(void *blob, const char *basename,
--------------------------------- lib/fdtdec.c ---------------------------------
index 74430c8b2f..d7c3684145 100644
@@ -1363,7 +1363,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,
}
if (addr == carveout->start && (addr + size) == carveout->end) {
- *phandlep = fdt_get_phandle(blob, node);
+ if (phandlep)
+ *phandlep = fdt_get_phandle(blob, node);
return 0;
}
}
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...