diff options
| author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2012-11-14 11:42:21 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2012-11-14 11:42:21 +0000 |
| commit | 52c1374d7fc35cd275ced4daf7101d713d7ec294 (patch) | |
| tree | cace4e7ead82fbe59081a4f39ea6f1b2579fd032 /xen/arch/x86/mm | |
| parent | ef3cea268fdff77f93368369c5998b1c975aa297 (diff) | |
| download | xen-52c1374d7fc35cd275ced4daf7101d713d7ec294.tar.gz xen-52c1374d7fc35cd275ced4daf7101d713d7ec294.tar.bz2 xen-52c1374d7fc35cd275ced4daf7101d713d7ec294.zip | |
xen/mm/shadow: check toplevel pagetables are present before unhooking them.
If the guest has not fully populated its top-level PAE entries when it calls
HVMOP_pagetable_dying, the shadow code could try to unhook entries from
MFN 0. Add a check to avoid that case.
This issue was introduced by c/s 21239:b9d2db109cf5.
This is a security problem, XSA-23 / CVE-2012-4538.
Signed-off-by: Tim Deegan <tim@xen.org>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'xen/arch/x86/mm')
| -rw-r--r-- | xen/arch/x86/mm/shadow/multi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 39cb7de232..4967da1d35 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4478,8 +4478,12 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) unsigned long gfn; mfn_t smfn, gmfn; - if ( fast_path ) - smfn = _mfn(pagetable_get_pfn(v->arch.shadow_table[i])); + if ( fast_path ) { + if ( pagetable_is_null(v->arch.shadow_table[i]) ) + smfn = _mfn(INVALID_MFN); + else + smfn = _mfn(pagetable_get_pfn(v->arch.shadow_table[i])); + } else { /* retrieving the l2s */ |