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: fe14042358
("of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d0d0ad10a1
commit
df9fb50ad5
|
@ -333,6 +333,9 @@ static void __unflatten_device_tree(void *blob,
|
||||||
|
|
||||||
/* Allocate memory for the expanded device tree */
|
/* Allocate memory for the expanded device tree */
|
||||||
mem = dt_alloc(size + 4, __alignof__(struct device_node));
|
mem = dt_alloc(size + 4, __alignof__(struct device_node));
|
||||||
|
if (!mem)
|
||||||
|
return;
|
||||||
|
|
||||||
memset(mem, 0, size);
|
memset(mem, 0, size);
|
||||||
|
|
||||||
*(__be32 *)(mem + size) = cpu_to_be32(0xdeadbeef);
|
*(__be32 *)(mem + size) = cpu_to_be32(0xdeadbeef);
|
||||||
|
|
Loading…
Reference in New Issue