[Xen-changelog] [xen master] x86: correct assertion in destroy_perdomain_mapping()

[patchbot@xxxxxxx]

commit f26441439e5bacff948b172cb4d2da3ad8ec7ebd
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Apr 23 16:12:01 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Apr 23 16:12:01 2018 +0200

    x86: correct assertion in destroy_perdomain_mapping()
    
    hvm_domain_initialise() may call this with nr being zero, which triggers
    the "does not cross L3 boundary" check.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Release-acked-by: Juergen Gross <jgross@xxxxxxxx>
---
 xen/arch/x86/mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 9fe5583fc3..53b36d8889 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -5475,7 +5475,7 @@ void destroy_perdomain_mapping(struct domain *d, unsigned 
long va,
 
     ASSERT(va >= PERDOMAIN_VIRT_START &&
            va < PERDOMAIN_VIRT_SLOT(PERDOMAIN_SLOTS));
-    ASSERT(!l3_table_offset(va ^ (va + nr * PAGE_SIZE - 1)));
+    ASSERT(!nr || !l3_table_offset(va ^ (va + nr * PAGE_SIZE - 1)));
 
     if ( !d->arch.perdomain_l3_pg )
         return;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog