[PATCH 3.2 070/102] ARM: 8165/1: alignment: don't break misaligned NEON load/store
3.2.64-rc1 review patch. If anyone has any objections, please let me know. -- From: Robin Murphy commit 5ca918e5e3f9df4634077c06585c42bc6a8d699a upstream. The alignment fixup incorrectly decodes faulting ARM VLDn/VSTn instructions (where the optional alignment hint is given but incorrect) as LDR/STR, leading to register corruption. Detect these and correctly treat them as unhandled, so that userspace gets the fault it expects. Reported-by: Simon Hosie Signed-off-by: Robin Murphy Signed-off-by: Russell King Signed-off-by: Ben Hutchings --- arch/arm/mm/alignment.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -38,6 +38,7 @@ * This code is not portable to processors with late data abort handling. */ #define CODING_BITS(i) (i & 0x0e00) +#define COND_BITS(i) (i & 0xf000) #define LDST_I_BIT(i) (i & (1 << 26)) /* Immediate constant */ #define LDST_P_BIT(i) (i & (1 << 24)) /* Preindex */ @@ -812,6 +813,8 @@ do_alignment(unsigned long addr, unsigne break; case 0x0400:/* ldr or str immediate */ + if (COND_BITS(instr) == 0xf000) /* NEON VLDn, VSTn */ + goto bad; offset.un = OFFSET_BITS(instr); handler = do_alignment_ldrstr; break; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.2 070/102] ARM: 8165/1: alignment: don't break misaligned NEON load/store
3.2.64-rc1 review patch. If anyone has any objections, please let me know. -- From: Robin Murphy robin.mur...@arm.com commit 5ca918e5e3f9df4634077c06585c42bc6a8d699a upstream. The alignment fixup incorrectly decodes faulting ARM VLDn/VSTn instructions (where the optional alignment hint is given but incorrect) as LDR/STR, leading to register corruption. Detect these and correctly treat them as unhandled, so that userspace gets the fault it expects. Reported-by: Simon Hosie simon.ho...@arm.com Signed-off-by: Robin Murphy robin.mur...@arm.com Signed-off-by: Russell King rmk+ker...@arm.linux.org.uk Signed-off-by: Ben Hutchings b...@decadent.org.uk --- arch/arm/mm/alignment.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -38,6 +38,7 @@ * This code is not portable to processors with late data abort handling. */ #define CODING_BITS(i) (i 0x0e00) +#define COND_BITS(i) (i 0xf000) #define LDST_I_BIT(i) (i (1 26)) /* Immediate constant */ #define LDST_P_BIT(i) (i (1 24)) /* Preindex */ @@ -812,6 +813,8 @@ do_alignment(unsigned long addr, unsigne break; case 0x0400:/* ldr or str immediate */ + if (COND_BITS(instr) == 0xf000) /* NEON VLDn, VSTn */ + goto bad; offset.un = OFFSET_BITS(instr); handler = do_alignment_ldrstr; break; -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
