[Xen-changelog] [xen master] xen/arm: Upgrade DCISW into DCCISW

[patchbot@xxxxxxx]

commit cda12fa0cee7023878598ff8ced3613b57576ce3
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Mon Apr 14 20:46:43 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Apr 23 10:30:34 2014 +0100

    xen/arm: Upgrade DCISW into DCCISW
    
    A guest is allowed to use invalidate cache by set/way instruction (i.e 
DCISW)
    without any restriction. As the cache is shared with Xen, the guest 
invalidate
    an address being in used by Xen. This may lead a Xen crash because the 
memory
    state is invalid.
    Set the bit HCR.SWIO to upgrade invalidate cache by set/way instruction to 
an
    invalidate and clean.
    
    This is CVE-2014-2915 / XSA-93.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Reported-by: Thomas Leonard <tal36@xxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/traps.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 97ab286..17ac8d8 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -82,7 +82,7 @@ void __cpuinit init_traps(void)
 
     /* Setup hypervisor traps */
     WRITE_SYSREG(HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC|
-                 HCR_TAC, HCR_EL2);
+                 HCR_TAC|HCR_SWIO, HCR_EL2);
     isb();
 }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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