646cd8897b
Updated block-dmmd script - fate#310510 - fix xenpaging restore changes to integrate paging into xm/xend xenpaging.autostart.patch xenpaging.doc.patch - bnc#787163 - VUL-0: CVE-2012-4544: xen: Domain builder Out-of- memory due to malicious kernel/ramdisk (XSA 25) CVE-2012-4544-xsa25.patch - bnc#779212 - VUL-0: CVE-2012-4411: XEN / qemu: guest administrator can access qemu monitor console (XSA-19) CVE-2012-4411-xsa19.patch - bnc#786516 - VUL-0: CVE-2012-4535: xen: Timer overflow DoS vulnerability CVE-2012-4535-xsa20.patch - bnc#786518 - VUL-0: CVE-2012-4536: xen: pirq range check DoS vulnerability CVE-2012-4536-xsa21.patch - bnc#786517 - VUL-0: CVE-2012-4537: xen: Memory mapping failure DoS vulnerability CVE-2012-4537-xsa22.patch - bnc#786519 - VUL-0: CVE-2012-4538: xen: Unhooking empty PAE entries DoS vulnerability CVE-2012-4538-xsa23.patch - bnc#786520 - VUL-0: CVE-2012-4539: xen: Grant table hypercall infinite loop DoS vulnerability CVE-2012-4539-xsa24.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=212
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
References: CVE-2012-4537 XSA-22 bnc#786517
|
|
|
|
x86/physmap: Prevent incorrect updates of m2p mappings
|
|
|
|
In certain conditions, such as low memory, set_p2m_entry() can fail.
|
|
Currently, the p2m and m2p tables will get out of sync because we still
|
|
update the m2p table after the p2m update has failed.
|
|
|
|
If that happens, subsequent guest-invoked memory operations can cause
|
|
BUG()s and ASSERT()s to kill Xen.
|
|
|
|
This is fixed by only updating the m2p table iff the p2m was
|
|
successfully updated.
|
|
|
|
This is a security problem, XSA-22 / CVE-2012-4537.
|
|
|
|
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
|
|
Index: xen-4.2.0-testing/xen/arch/x86/mm/p2m.c
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/xen/arch/x86/mm/p2m.c
|
|
+++ xen-4.2.0-testing/xen/arch/x86/mm/p2m.c
|
|
@@ -654,7 +654,10 @@ guest_physmap_add_entry(struct domain *d
|
|
if ( mfn_valid(_mfn(mfn)) )
|
|
{
|
|
if ( !set_p2m_entry(p2m, gfn, _mfn(mfn), page_order, t, p2m->default_access) )
|
|
+ {
|
|
rc = -EINVAL;
|
|
+ goto out; /* Failed to update p2m, bail without updating m2p. */
|
|
+ }
|
|
if ( !p2m_is_grant(t) )
|
|
{
|
|
for ( i = 0; i < (1UL << page_order); i++ )
|
|
@@ -677,6 +680,7 @@ guest_physmap_add_entry(struct domain *d
|
|
}
|
|
}
|
|
|
|
+out:
|
|
p2m_unlock(p2m);
|
|
|
|
return rc;
|