From a1c5825cbb732a4b2af183007cce1ca99019174b Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Wed, 7 Mar 2012 08:54:24 +0000 Subject: [PATCH] x86/mm: Don't lose track of the log dirty bitmap hap_log_dirty_init unconditionally sets the top of the log dirty bitmap to INVALID_MFN. If there had been a bitmap allocated, it is then leaked, and the host crashes on an ASSERT when the domain is cleaned up. Signed-off-by: Tim Deegan Acked-by: Andres Lagar-Cavilla Committed-by: Tim Deegan xen-unstable changeset: 24282:a06cda9fb25f xen-unstable date: Thu Dec 01 14:17:16 2011 +0000 --- xen/arch/x86/mm/paging.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index a126fa8c0f..b11577a204 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -621,7 +621,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.enable_log_dirty = enable_log_dirty; d->arch.paging.log_dirty.disable_log_dirty = disable_log_dirty; d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); } /* This function fress log dirty bitmap resources. */ @@ -642,6 +641,11 @@ int paging_domain_init(struct domain *d, unsigned int domcr_flags) if ( (rc = p2m_init(d)) != 0 ) return rc; + /* This must be initialized separately from the rest of the + * log-dirty init code as that can be called more than once and we + * don't want to leak any active log-dirty bitmaps */ + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + /* The order of the *_init calls below is important, as the later * ones may rewrite some common fields. Shadow pagetables are the * default... */ -- 2.39.5