From: Wei Liu Date: Tue, 20 Oct 2020 12:37:31 +0000 (+0200) Subject: x86/mm: Refactor modify_xen_mappings to have one exit path X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~33^2~40 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=809a70b161ca0adaed0ef198e2b86e846f9de442;p=xen.git x86/mm: Refactor modify_xen_mappings to have one exit path We will soon need to perform clean-ups before returning. No functional change. This is part of XSA-345. Reported-by: Hongyan Xia Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia Signed-off-by: George Dunlap Acked-by: Jan Beulich master commit: b733f8a8b8db83f2d438cab3adb38b387cecfce0 master date: 2020-10-20 14:19:55 +0200 --- diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 03f6e6aa62..2468347a45 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5477,6 +5477,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) l1_pgentry_t *pl1e; unsigned int i; unsigned long v = s; + int rc = -ENOMEM; /* Set of valid PTE bits which may be altered. */ #define FLAGS_MASK (_PAGE_NX|_PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_RW|_PAGE_PRESENT) @@ -5520,7 +5521,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) /* PAGE1GB: shatter the superpage and fall through. */ l2t = alloc_xen_pagetable(); if ( !l2t ) - return -ENOMEM; + goto out; + for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ ) l2e_write(l2t + i, l2e_from_pfn(l3e_get_pfn(*pl3e) + @@ -5577,7 +5579,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) /* PSE: shatter the superpage and try again. */ l1t = alloc_xen_pagetable(); if ( !l1t ) - return -ENOMEM; + goto out; + for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) l1e_write(&l1t[i], l1e_from_pfn(l2e_get_pfn(*pl2e) + i, @@ -5710,7 +5713,10 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) flush_area(NULL, FLUSH_TLB_GLOBAL); #undef FLAGS_MASK - return 0; + rc = 0; + + out: + return rc; } #undef flush_area