The conditional MOVS instruction that appears to have been added to test for the TIF_USING_IWMMXT thread_info flag only sets the N and Z condition flags and register R7, none of which are referenced in the subsequent code. This means that the instruction does nothing, which means that we might misidentify faulting FPE instructions as iWMMXT instructions on kernels that were built to support both.

This seems to have been part of the original submission of the code, and so this has never worked as intended, and nobody ever noticed, and so we might decide to just leave this as-is. However, with the ongoing move towards multiplatform kernels, the issue becomes more likely to manifest, and so it is better to fix it.

So check whether we are dealing with an undef exception regarding coprocessor index #0 or #1, and if so, load the thread_info flag and only dispatch it as a iWMMXT trap if the flag is set.

Cc: stable@vger.kernel.org # v2.6.9+ Signed-off-by: Ard Biesheuvel ardb@kernel.org --- arch/arm/kernel/entry-armv.S | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index c39303e5c23470e6..c5d2f07994fb0d87 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -606,10 +606,11 @@ call_fpe: strb r7, [r6, #TI_USED_CP] @ set appropriate used_cp[] #ifdef CONFIG_IWMMXT @ Test if we need to give access to iWMMXt coprocessors - ldr r5, [r10, #TI_FLAGS] - rsbs r7, r8, #(1 << 8) @ CP 0 or 1 only - movscs r7, r5, lsr #(TIF_USING_IWMMXT + 1) - bcs iwmmxt_task_enable + tst r8, #0xe << 8 @ CP 0 or 1? + ldreq r5, [r10, #TI_FLAGS] @ if so, load thread_info flags + andeq r5, r5, #1 << TIF_USING_IWMMXT @ isolate TIF_USING_IWMMXT flag + teqeq r5, #1 << TIF_USING_IWMMXT @ check whether it is set + beq iwmmxt_task_enable @ branch if set #endif ARM( add pc, pc, r8, lsr #6 ) THUMB( lsr r8, r8, #6 )