linux-kernel - Re: [RESEND PATCH] MIPS: head: Reorder instructions missing a delay slot

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170627203131.GH31455@jhogan-linux.le.imgtec.org>
Date:   Tue, 27 Jun 2017 21:31:31 +0100
From:   James Hogan <james.hogan@...tec.com>
To:     Karl Beldan <karl.beldan@...il.com>
CC:     <linux-mips@...ux-mips.org>, <linux-kernel@...r.kernel.org>,
        Karl Beldan <karl.beldan+oss@...il.com>,
        <stable@...r.kernel.org>, Ralf Baechle <ralf@...ux-mips.org>,
        Jonas Gorski <jogo@...nwrt.org>
Subject: Re: [RESEND PATCH] MIPS: head: Reorder instructions missing a delay
 slot

On Tue, Jun 27, 2017 at 07:22:16PM +0000, Karl Beldan wrote:
> In this sequence the 'move' is assumed in the delay slot of the 'beq',
> but head.S is in reorder mode and the former gets pushed one 'nop'
> farther by the assembler.
> 
> The corrected behavior made booting with an UHI supplied dtb erratic.
> 
> Fixes: 15f37e158892 ("MIPS: store the appended dtb address in a variable")
> Cc: <stable@...r.kernel.org>
> Cc: Ralf Baechle <ralf@...ux-mips.org>
> Cc: Jonas Gorski <jogo@...nwrt.org>
> Signed-off-by: Karl Beldan <karl.beldan+oss@...il.com>

Ouch, nice catch.

Reviewed-by: James Hogan <james.hogan@...tec.com>

Cheers
James

> ---
>  arch/mips/kernel/head.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
> index cf05220..d1bb506 100644
> --- a/arch/mips/kernel/head.S
> +++ b/arch/mips/kernel/head.S
> @@ -106,8 +106,8 @@ NESTED(kernel_entry, 16, sp)			# kernel entry point
>  	beq		t0, t1, dtb_found
>  #endif
>  	li		t1, -2
> -	beq		a0, t1, dtb_found
>  	move		t2, a1
> +	beq		a0, t1, dtb_found
>  
>  	li		t2, 0
>  dtb_found:
> -- 
> 2.10.1
> 
> 

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)