From b2dbbc0577e326b6dc1babaa53fb46605c996a72 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Thu, 20 May 2021 15:47:07 +0530 Subject: lib: Check region base for merging in sbi_domain_root_add_memregion() We can merge region B onto region A only if base of region A is aligned to region A order + 1. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Xiang W --- lib/sbi/sbi_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/sbi') diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c index 84f30b9..3096af0 100644 --- a/lib/sbi/sbi_domain.c +++ b/lib/sbi/sbi_domain.c @@ -511,7 +511,8 @@ int sbi_domain_root_add_memregion(const struct sbi_domain_memregion *reg) if (!nreg1->order) continue; - if ((nreg->base + BIT(nreg->order)) == nreg1->base && + if (!(nreg->base & (BIT(nreg->order + 1) - 1)) && + (nreg->base + BIT(nreg->order)) == nreg1->base && nreg->order == nreg1->order && nreg->flags == nreg1->flags) { nreg->order++; -- cgit v1.2.3