From da76085d86b59a229f1afb3a88aa5bfa105aea06 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 17 May 2017 17:29:09 +0200 Subject: [PATCH] of: fdt: add missing allocation-failure check commit 49e67dd17649b60b4d54966e18ec9c80198227f0 upstream. The memory allocator passed to __unflatten_device_tree() (e.g. a wrapped kzalloc) can fail so add the missing sanity check to avoid dereferencing a NULL pointer. Fixes: fe14042358fa ("of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree") Signed-off-by: Johan Hovold Signed-off-by: Rob Herring [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- drivers/of/fdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index b77808c4daa83..29f121e9345b3 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -388,6 +388,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob, /* Allocate memory for the expanded device tree */ mem = (unsigned long) dt_alloc(size + 4, __alignof__(struct device_node)); + if (!mem) + return NULL; memset((void *)mem, 0, size); -- 2.47.2