diff options
| author | Linus Torvalds | 2017-05-20 00:03:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-05-20 00:03:24 +0200 |
| commit | 1fbbed4137de93e02fc62776b8bf08a2d9ae1141 (patch) | |
| tree | 1a50291637d723e1a49eed91d5d15d22452750c4 /drivers/of/fdt.c | |
| parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... (diff) | |
| parent | of: fdt: add missing allocation-failure check (diff) | |
| download | kernel-qcow2-linux-1fbbed4137de93e02fc62776b8bf08a2d9ae1141.tar.gz kernel-qcow2-linux-1fbbed4137de93e02fc62776b8bf08a2d9ae1141.tar.xz kernel-qcow2-linux-1fbbed4137de93e02fc62776b8bf08a2d9ae1141.zip | |
Merge tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- fix missing allocation failure handling in fdt code
- fix dtc compile error on 32-bit hosts
- revert bad sparse changes causing GCC7 warnings
* tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: fdt: add missing allocation-failure check
dtc: check.c fix compile error
Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code"
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 3080d9dd031d..43bd69dceabf 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); |