From c4c37506fa1e6fa06feecdb4eb1184e88ebc261a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 3 May 2017 17:15:31 +0200 Subject: [PATCH] memory: don't hand MFN info to translated guests We shouldn't hand MFN info back from increase-reservation for translated domains, just like we don't for populate-physmap and memory-exchange. For full symmetry also check for a NULL guest handle in populate_physmap() (but note this makes no sense in memory_exchange(), as there the array is also an input). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: d18627583df28facd9af473ea1ac4a56e93e6ea9 master date: 2017-04-05 16:39:53 +0200 --- xen/common/memory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b2a2ce427c..c2f0a77440 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -123,7 +123,8 @@ static void increase_reservation(struct memop_args *a) } /* Inform the domain of the new page's machine address. */ - if ( !guest_handle_is_null(a->extent_list) ) + if ( !paging_mode_translate(d) && + !guest_handle_is_null(a->extent_list) ) { mfn = page_to_mfn(page); if ( unlikely(__copy_to_guest_offset(a->extent_list, i, &mfn, 1)) ) @@ -215,7 +216,8 @@ static void populate_physmap(struct memop_args *a) mfn = page_to_mfn(page); guest_physmap_add_page(d, gpfn, mfn, a->extent_order); - if ( !paging_mode_translate(d) ) + if ( !paging_mode_translate(d) && + !guest_handle_is_null(a->extent_list) ) { for ( j = 0; j < (1 << a->extent_order); j++ ) set_gpfn_from_mfn(mfn + j, gpfn + j);