3f55414718
- Upstream or pending upstream patches from Jan 25587-fix-off-by-one-parsing-error.patch 25616-x86-MCi_CTL-default.patch 25617-vtd-qinval-addr.patch 25688-x86-nr_irqs_gsi.patch - bnc#773393 - VUL-0: CVE-2012-3433: xen: HVM guest destroy p2m teardown host DoS vulnerability CVE-2012-3433-xsa11.patch - bnc#773401 - VUL-1: CVE-2012-3432: xen: HVM guest user mode MMIO emulation DoS 25682-x86-inconsistent-io-state.patch - bnc#762484 - VUL-1: CVE-2012-2625: xen: pv bootloader doesn't check the size of the bzip2 or lzma compressed kernel, leading to denial of service 25589-pygrub-size-limits.patch - Make it build with latest TeXLive 2012 with new package layout OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=196
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
changeset: 24586:7a28b8b2d3ea
|
|
user: Andres Lagar-Cavilla <andres@lagarcavilla.org>
|
|
date: Thu Jan 26 13:21:27 2012 +0000
|
|
files: xen/arch/x86/mm/p2m.c
|
|
description:
|
|
x86/mm: Properly account for paged out pages
|
|
|
|
If we hit the page after nominate but before paging it out, don't decrement the
|
|
domain count of paged out pages.
|
|
|
|
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
|
|
Acked-by: Tim Deegan <tim@xen.org>
|
|
Committed-by: Tim Deegan <tim@xen.org>
|
|
|
|
|
|
---
|
|
xen/arch/x86/mm/p2m.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
Index: xen-4.1.3-testing/xen/arch/x86/mm/p2m.c
|
|
===================================================================
|
|
--- xen-4.1.3-testing.orig/xen/arch/x86/mm/p2m.c
|
|
+++ xen-4.1.3-testing/xen/arch/x86/mm/p2m.c
|
|
@@ -3156,7 +3156,8 @@ int p2m_mem_paging_prep(struct p2m_domai
|
|
set_p2m_entry(p2m, gfn, mfn, 0, p2m_ram_paging_in, a);
|
|
audit_p2m(p2m, 1);
|
|
|
|
- atomic_dec(&p2m->domain->paged_pages);
|
|
+ if ( !page_extant )
|
|
+ atomic_dec(&p2m->domain->paged_pages);
|
|
|
|
ret = 0;
|
|
out:
|