From c1a4914323eecce82a664896845947fa1dd73ce4 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 7 Jul 2020 15:28:25 +0200 Subject: [PATCH] x86/shadow: correct an inverted conditional in dirty VRAM tracking This originally was "mfn_x(mfn) == INVALID_MFN". Make it like this again, taking the opportunity to also drop the unnecessary nearby braces. This is XSA-319. Fixes: 246a5a3377c2 ("xen: Use a typesafe to define INVALID_MFN") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 23a216f99d40fbfbc2318ade89d8213eea6ba1f8 master date: 2020-07-07 14:36:24 +0200 --- xen/arch/x86/mm/shadow/common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 48f03b3beb..8ee61f8784 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3758,10 +3758,8 @@ int shadow_track_dirty_vram(struct domain *d, int dirty = 0; paddr_t sl1ma = dirty_vram->sl1ma[i]; - if ( !mfn_eq(mfn, INVALID_MFN) ) - { + if ( mfn_eq(mfn, INVALID_MFN) ) dirty = 1; - } else { page = mfn_to_page(mfn); -- 2.39.5