diff options
| author | Johan Hovold <johan@kernel.org> | 2017-05-17 17:29:09 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-05-17 11:36:52 -0500 |
| commit | 49e67dd17649b60b4d54966e18ec9c80198227f0 (patch) | |
| tree | 91ae0cb4b14b989597251e71eed5e34c4f4e7a70 /drivers/of/fdt.c | |
| parent | 828d4cdd012c8ffbf76625c3ff164312e8666784 (diff) | |
| download | linux-stable-49e67dd17649b60b4d54966e18ec9c80198227f0.tar.gz linux-stable-49e67dd17649b60b4d54966e18ec9c80198227f0.tar.bz2 linux-stable-49e67dd17649b60b4d54966e18ec9c80198227f0.zip | |
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: fe14042358fa ("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>
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a0972219ccfc..0373ae49d24d 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -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); |