From mboxrd@z Thu Jan  1 00:00:00 1970
From: Julien Grall <julien.grall@citrix.com>
Subject: Re: [PATCH 02/19] xen: arm: add missing break
Date: Thu, 2 Apr 2015 16:09:22 +0100
Message-ID: <551D5BA2.1060903@citrix.com>
References: <1427796446.2115.34.camel@citrix.com>
	<1427796462-24376-2-git-send-email-ian.campbell@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1427796462-24376-2-git-send-email-ian.campbell@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
Cc: julien.grall@linaro.org, tim@xen.org, stefano.stabellini@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

Hi Ian,

On 31/03/2015 11:07, Ian Campbell wrote:
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>
> xen: arm: Fix handling of ICC_{SGI1R,SGI0R,ASGI1R}_EL1
>
> Having injected an undefined instruction we don't want to also advance
> pc. So return.
>
> THe ICC_{SGI0R,ASGI1R}_EL1 case was previously missing a break, so
> would have fallen through to the default case and injected a second
> undef, corrupting SPSR_EL1 and ELR_EL1 for the guest.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Julien Grall <julien.grall@citrix.com>

Regards,

> ---
>   xen/arch/arm/traps.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index 69b9513..99ceaea 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -1908,7 +1908,7 @@ static void do_sysreg(struct cpu_user_regs *regs,
>           {
>               dprintk(XENLOG_WARNING,
>                       "failed emulation of sysreg ICC_SGI1R_EL1 access\n");
> -            inject_undef64_exception(regs, hsr.len);
> +            return inject_undef64_exception(regs, hsr.len);
>           }
>           break;
>       case HSR_SYSREG_ICC_SGI0R_EL1:
> @@ -1916,7 +1916,7 @@ static void do_sysreg(struct cpu_user_regs *regs,
>           /* TBD: Implement to support secure grp0/1 SGI forwarding */
>           dprintk(XENLOG_WARNING,
>                   "Emulation of sysreg ICC_SGI0R_EL1/ASGI1R_EL1 not supported\n");
> -        inject_undef64_exception(regs, hsr.len);
> +        return inject_undef64_exception(regs, hsr.len);
>       default:
>           {
>               const struct hsr_sysreg sysreg = hsr.sysreg;
>

-- 
Julien Grall