[Xen-changelog] [xen stable-4.2] ix86: fix linear page table construction in alloc_l2_table()

[patchbot@xxxxxxx]

commit fe046454eb9e44e99706bc2b42058aa0a9e2631b
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jan 13 15:57:07 2014 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jan 13 15:57:07 2014 +0100

    ix86: fix linear page table construction in alloc_l2_table()
    
    Slot 0 got updated when slot 3 was meant. The mistake was hidden by
    create_pae_xen_mappings() correcting things immediately afterwards
    (i.e. before the new entries could get used the first time).
    
    Reported-by: CHENG Yueqiang <yqcheng.2008@xxxxxxxxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>
---
 xen/arch/x86/mm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index daba883..01f3002 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1488,7 +1488,7 @@ static int alloc_l2_table(struct page_info *page, 
unsigned long type,
             l2e_write(&pl2e[l2_table_offset(PERDOMAIN_VIRT_START) + i],
                       l2e_from_page(perdomain_pt_page(d, i),
                                     __PAGE_HYPERVISOR));
-        pl2e[l2_table_offset(LINEAR_PT_VIRT_START)] =
+        pl2e[l2_table_offset(LINEAR_PT_VIRT_START) + 3] =
             l2e_from_pfn(pfn, __PAGE_HYPERVISOR);
 #else
         memcpy(&pl2e[COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(d)],
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog