mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
xen: arm: Allow traps from 32 bit userspace on 64 bit hypervisors again
This removes the unconditional #undef injected in response to such
traps which was added by the fixes to CVE-2014-5147 / XSA-102 in
c0020e0997 "xen: arm: Handle traps from 32-bit userspace on 64-bit
kernel as undef", we now handle such traps correctly.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Julien Grall <julien.grall@linaro.org>
This commit is contained in:
1 parent
3617fe112e
commit
650ed2cef3
1 file changed
-12
@@ -2070,18 +2070,6 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs)
|
||||
|
||||
enter_hypervisor_head(regs);
|
||||
|
||||
/*
|
||||
* We currently do not handle 32-bit userspace on 64-bit kernels
|
||||
* correctly (See XSA-102). Until that is resolved we treat any
|
||||
* trap from 32-bit userspace on 64-bit kernel as undefined.
|
||||
*/
|
||||
if ( !hyp_mode(regs) && is_64bit_domain(current->domain) &&
|
||||
psr_mode_is_32bit(regs->cpsr) )
|
||||
{
|
||||
inject_undef_exception(regs, hsr.len);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (hsr.ec) {
|
||||
case HSR_EC_WFI_WFE:
|
||||
if ( !check_conditional_instr(regs, hsr) )
|
||||
|
||||