mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
xen/arm: p2m: Check for p2m->domain to be initialized before releasing resources
Since p2m_teardown() can be called when p2m_init() haven't executed yet we might deal with unitialized list "p2m->pages" which leads to crash. To avoid this use back pointer to domain as end-of-initialization indicator. Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> Signed-off-by: Stefano Stabellini <sstabellini@kernel.org> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
1 parent
b1f1e492cd
commit
abd91b2a2b
1 file changed
+13
-1
+13
-1
@@ -1219,6 +1219,10 @@ void p2m_teardown(struct domain *d)
|
||||
struct p2m_domain *p2m = p2m_get_hostp2m(d);
|
||||
struct page_info *pg;
|
||||
|
||||
/* p2m not actually initialized */
|
||||
if ( !p2m->domain )
|
||||
return;
|
||||
|
||||
while ( (pg = page_list_remove_head(&p2m->pages)) )
|
||||
free_domheap_page(pg);
|
||||
|
||||
@@ -1230,6 +1234,8 @@ void p2m_teardown(struct domain *d)
|
||||
p2m_free_vmid(d);
|
||||
|
||||
radix_tree_destroy(&p2m->mem_access_settings, NULL);
|
||||
|
||||
p2m->domain = NULL;
|
||||
}
|
||||
|
||||
int p2m_init(struct domain *d)
|
||||
@@ -1247,7 +1253,6 @@ int p2m_init(struct domain *d)
|
||||
if ( rc != 0 )
|
||||
return rc;
|
||||
|
||||
p2m->domain = d;
|
||||
p2m->max_mapped_gfn = _gfn(0);
|
||||
p2m->lowest_mapped_gfn = _gfn(ULONG_MAX);
|
||||
|
||||
@@ -1276,6 +1281,13 @@ int p2m_init(struct domain *d)
|
||||
for_each_possible_cpu(cpu)
|
||||
p2m->last_vcpu_ran[cpu] = INVALID_VCPU_ID;
|
||||
|
||||
/*
|
||||
* Besides getting a domain when we only have the p2m in hand,
|
||||
* the back pointer to domain is also used in p2m_teardown()
|
||||
* as an end-of-initialization indicator.
|
||||
*/
|
||||
p2m->domain = d;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||