From: Stefano Stabellini Date: Tue, 8 Oct 2019 01:15:00 +0000 (-0700) Subject: xen/arm: make_memory_node return error on nr_banks == 0 X-Git-Tag: temptemp~1258 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a89a41bc33d4fe16609090179aa7d92fbba90138;p=people%2Fhx242%2Fxen.git xen/arm: make_memory_node return error on nr_banks == 0 Call make_memory_node for reserved_memory only if we actually have any reserved_memory regions to handle. Add a check in make_memory_node to return an error if it has been called with no memory banks as argument. Fixes: 248faa637d2 (xen/arm: add reserved-memory regions to the dom0 memory node) Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Release-acked-by: Juergen Gross --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 921b054520..5ab84e5839 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -650,6 +650,8 @@ static int __init make_memory_node(const struct domain *d, __be32 *cells; BUG_ON(nr_cells >= ARRAY_SIZE(reg)); + if ( mem->nr_banks == 0 ) + return -ENOENT; dt_dprintk("Create memory node (reg size %d, nr cells %d)\n", reg_size, nr_cells); @@ -1540,10 +1542,13 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, * Create a second memory node to store the ranges covering * reserved-memory regions. */ - res = make_memory_node(d, kinfo->fdt, addrcells, sizecells, - &bootinfo.reserved_mem); - if ( res ) - return res; + if ( bootinfo.reserved_mem.nr_banks > 0 ) + { + res = make_memory_node(d, kinfo->fdt, addrcells, sizecells, + &bootinfo.reserved_mem); + if ( res ) + return res; + } } res = fdt_end_node(kinfo->fdt);