[Pkg-xen-changes] [xen] 02/08: xen: arm: correct arm64 version of gva_to_ma_par

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch debian/jessie
in repository xen.

commit 341236af928ad65e738f02426768378d7c98607c
Author: Ian Campbell <ian.campbell at citrix.com>
Date:   Fri Mar 13 10:39:50 2015 +0000

    xen: arm: correct arm64 version of gva_to_ma_par
    
    The implementation was backwards and checked that the guest could
    read when asked about write and vice versa.
    
    This is an update to the fix for XSA-98.
    
    Reported-by: Tamas K Lengyel <tklengyel at sec.in.tum.de>
    Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
    (cherry picked from commit c1245e9d5bf311b5a3267ea4b077a16561fcf439)
    (cherry picked from commit 04ac29f0c38236840ed852b4fc0933d388a0e776)
    
    Patch-Name: CVE-2014-3969-update-1.diff
---
 xen/include/asm-arm/arm64/page.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h
index 3922d87..de903c9 100644
--- a/xen/include/asm-arm/arm64/page.h
+++ b/xen/include/asm-arm/arm64/page.h
@@ -88,9 +88,9 @@ static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags)
     uint64_t par, tmp = READ_SYSREG64(PAR_EL1);
 
     if ( (flags & GV2M_WRITE) == GV2M_WRITE )
-        asm volatile ("at s12e1r, %0;" : : "r" (va));
-    else
         asm volatile ("at s12e1w, %0;" : : "r" (va));
+    else
+        asm volatile ("at s12e1r, %0;" : : "r" (va));
     isb();
     par = READ_SYSREG64(PAR_EL1);
     WRITE_SYSREG64(tmp, PAR_EL1);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git