Commit 49e67dd1 authored May 17, 2017 by Johan Hovold Committed by Rob Herring May 17, 2017

of: fdt: add missing allocation-failure check



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: fe140423 ("of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree")
Cc: stable <stable@vger.kernel.org>     # 2.6.38
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>

parent 828d4cdd

drivers/of/fdt.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,9 @@ void __unflatten_device_tree(const void blob,

		/* Allocate memory for the expanded device tree */
		mem = dt_alloc(size + 4, __alignof__(struct device_node));
		if (!mem)
		return NULL;

		memset(mem, 0, size);

		(__be32 )(mem + size) = cpu_to_be32(0xdeadbeef);