| From | Ben Hutchings <> | Date | Sat, 09 Sep 2017 22:47:39 +0100 | Subject | [PATCH 3.2 023/106] of: fdt: add missing allocation-failure check |
| |
3.2.93-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <johan@kernel.org>
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 <johan@kernel.org> Signed-off-by: Rob Herring <robh@kernel.org> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -388,6 +388,8 @@ static void __unflatten_device_tree(stru /* 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);
|