aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-08-28 21:24:17 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 17:21:58 -0700
commit763532e99224fec0693197a4b67386eced519d05 (patch)
tree524f254c84813e3cc3ed801fdc6c0b9c3f92f249
parent4963c59acdce47f2b15c49c58a8579f66cfa3ea7 (diff)
downloadlinux-linaro-stable-763532e99224fec0693197a4b67386eced519d05.tar.gz
of: Fix missing memory initialization on FDT unflattening
commit 0640332e073be9207f0784df43595c0c39716e42 upstream. Any calls to dt_alloc() need to be zeroed. This is a temporary fix, but the allocation function itself needs to zero memory before returning it. This is a follow up to patch 9e4012752, "of: fdt: fix memory initialization for expanded DT" which fixed one call site but missed another. Signed-off-by: Grant Likely <grant.likely@linaro.org> Acked-by: Wladislav Wiebe <wladislav.kw@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/of/base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 5c5427918eb2..bf8432f580f6 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1629,6 +1629,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
ap = dt_alloc(sizeof(*ap) + len + 1, 4);
if (!ap)
continue;
+ memset(ap, 0, sizeof(*ap) + len + 1);
ap->alias = start;
of_alias_add(ap, np, id, start, len);
}