From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 9/9] xen: arm: Allow traps from 32 bit userspace on 64 bit hypervisors again Date: Tue, 9 Sep 2014 17:23:08 +0100 Message-ID: <1410279788-27167-9-git-send-email-ian.campbell@citrix.com> References: <1410279730.8217.238.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1410279730.8217.238.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org This removes the unconditional #undef injected in response to such traps which was added by the fixes to CVE-2014-5147 / XSA-102 in c0020e099702 "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 --- xen/arch/arm/traps.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 78017db..7118a8c 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1953,17 +1953,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 ( 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) ) -- 1.7.10.4