Merge tag 'v3.10.13' into lsk/v3.10/topic/kvm

[firefly-linux-kernel-4.4.55.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index ffb84d506030f5e7cd1aa7ae9e45791ecc12d53f..fad95c811bec66e067f48e335073f56ce20f35d7 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1639,6 +1639,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);
        }