[PATCH 41/93] of: Fix missing memory initialization on FDT unflattening

Kamal Mostafa kamal at canonical.com
Fri Sep 20 20:08:36 UTC 2013


3.8.13.10 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Grant Likely <grant.likely at linaro.org>

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 at linaro.org>
Acked-by: Wladislav Wiebe <wladislav.kw at gmail.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/of/base.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 2390ddb..8d6faae 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1482,6 +1482,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);
 	}
-- 
1.8.1.2





More information about the kernel-team mailing list