mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/arm: Correct the p2m pool size calculations
Allocating or freeing p2m pages doesn't alter the size of the mempool; only
the split between free and used pages.
Right now, the hypercalls operate on the free subset of the pool, meaning that
XEN_DOMCTL_get_paging_mempool_size varies with time as the guest shuffles its
physmap, and XEN_DOMCTL_set_paging_mempool_size ignores the used subset of the
pool and lets the guest grow unbounded.
This fixes test-pagign-mempool on ARM so that the behaviour matches x86.
This is part of XSA-409 / CVE-2022-33747.
Fixes: cbea5a1149 ("xen/arm: Allocate and free P2M pages from the P2M pool")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>
Release-acked-by: Henry Wang <Henry.Wang@arm.com>
This commit is contained in:
1 parent
7c3bbd940d
commit
db8fa01c61
1 file changed
-4
@@ -72,7 +72,6 @@ static struct page_info *p2m_alloc_page(struct domain *d)
|
||||
spin_unlock(&d->arch.paging.lock);
|
||||
return NULL;
|
||||
}
|
||||
d->arch.paging.p2m_total_pages--;
|
||||
}
|
||||
spin_unlock(&d->arch.paging.lock);
|
||||
|
||||
@@ -85,10 +84,7 @@ static void p2m_free_page(struct domain *d, struct page_info *pg)
|
||||
if ( is_hardware_domain(d) )
|
||||
free_domheap_page(pg);
|
||||
else
|
||||
{
|
||||
d->arch.paging.p2m_total_pages++;
|
||||
page_list_add_tail(pg, &d->arch.paging.p2m_freelist);
|
||||
}
|
||||
spin_unlock(&d->arch.paging.lock);
|
||||
}
|
||||
|
||||
|
||||