summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-08-28 21:24:17 +0100
committerGrant Likely <grant.likely@linaro.org>2013-08-29 21:40:10 +0100
commit0640332e073be9207f0784df43595c0c39716e42 (patch)
tree6a3b6614b9fd6c13947bdbda70b6fe3b5404a8fd /drivers/of
parenta1727da599ad030ccaf4073473fd235c8ee28219 (diff)
downloadtalos-op-linux-0640332e073be9207f0784df43595c0c39716e42.tar.gz
talos-op-linux-0640332e073be9207f0784df43595c0c39716e42.zip
of: Fix missing memory initialization on FDT unflattening
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/of')
-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);
}
OpenPOWER on IntegriCloud