mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
mm: populate_physmap: validate correctly the gfn for direct mapped domain
Direct mapped domain has already the memory allocated 1:1, so we are directly using the gfn as mfn to map the RAM in the guest. While we are validating that the page associated to the first mfn belongs to the domain, the subsequent MFN are not validated when the extent_order is > 0. This may result to map memory region (MMIO, RAM) which doesn't belong to the domain. Although, only DOM0 on ARM is using a direct memory mapped. So it doesn't affect any guest (at least on the upstream version) or even x86. Signed-off-by: Julien Grall <julien.grall@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> Release-acked-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
1 parent
23d01fc376
commit
9503ab0e9c
1 file changed
+19
-13
+19
-13
@@ -126,22 +126,28 @@ static void populate_physmap(struct memop_args *a)
|
||||
if ( is_domain_direct_mapped(d) )
|
||||
{
|
||||
mfn = gpfn;
|
||||
if ( !mfn_valid(mfn) )
|
||||
|
||||
for ( j = 0; j < (1U << a->extent_order); j++, mfn++ )
|
||||
{
|
||||
gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n",
|
||||
mfn);
|
||||
goto out;
|
||||
if ( !mfn_valid(mfn) )
|
||||
{
|
||||
gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n",
|
||||
mfn);
|
||||
goto out;
|
||||
}
|
||||
|
||||
page = mfn_to_page(mfn);
|
||||
if ( !get_page(page, d) )
|
||||
{
|
||||
gdprintk(XENLOG_INFO,
|
||||
"mfn %#"PRI_xen_pfn" doesn't belong to the"
|
||||
" domain\n", mfn);
|
||||
goto out;
|
||||
}
|
||||
put_page(page);
|
||||
}
|
||||
|
||||
page = mfn_to_page(mfn);
|
||||
if ( !get_page(page, d) )
|
||||
{
|
||||
gdprintk(XENLOG_INFO,
|
||||
"mfn %#"PRI_xen_pfn" doesn't belong to the"
|
||||
" domain\n", mfn);
|
||||
goto out;
|
||||
}
|
||||
put_page(page);
|
||||
page = mfn_to_page(gpfn);
|
||||
}
|
||||
else
|
||||
page = alloc_domheap_pages(d, a->extent_order, a->memflags);
|
||||
|
||||