From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Subject: [PATCH 4.14 20/29] ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
Date: Mon, 27 Dec 2021 16:27:30 +0100 [thread overview]
Message-ID: <20211227151319.137346208@linuxfoundation.org> (raw)
In-Reply-To: <20211227151318.475251079@linuxfoundation.org>
From: Ard Biesheuvel <ardb@kernel.org>
commit 8536a5ef886005bc443c2da9b842d69fd3d7647f upstream.
The Thumb2 version of the FP exception handling entry code treats the
register holding the CP number (R8) differently, resulting in the iWMMXT
CP number check to be incorrect.
Fix this by unifying the ARM and Thumb2 code paths, and switch the
order of the additions of the TI_USED_CP offset and the shifted CP
index.
Cc: <stable@vger.kernel.org>
Fixes: b86040a59feb ("Thumb-2: Implementation of the unified start-up and exceptions code")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm/kernel/entry-armv.S | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -624,11 +624,9 @@ call_fpe:
tstne r0, #0x04000000 @ bit 26 set on both ARM and Thumb-2
reteq lr
and r8, r0, #0x00000f00 @ mask out CP number
- THUMB( lsr r8, r8, #8 )
mov r7, #1
- add r6, r10, #TI_USED_CP
- ARM( strb r7, [r6, r8, lsr #8] ) @ set appropriate used_cp[]
- THUMB( strb r7, [r6, r8] ) @ set appropriate used_cp[]
+ add r6, r10, r8, lsr #8 @ add used_cp[] array offset first
+ 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]
@@ -637,7 +635,7 @@ call_fpe:
bcs iwmmxt_task_enable
#endif
ARM( add pc, pc, r8, lsr #6 )
- THUMB( lsl r8, r8, #2 )
+ THUMB( lsr r8, r8, #6 )
THUMB( add pc, r8 )
nop
next prev parent reply other threads:[~2021-12-27 15:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 15:27 [PATCH 4.14 00/29] 4.14.260-rc1 review Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 01/29] net: usb: lan78xx: add Allied Telesis AT29M2-AF Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 02/29] can: kvaser_usb: get CAN clock frequency from device Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 03/29] HID: holtek: fix mouse probing Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 04/29] spi: change clk_disable_unprepare to clk_unprepare Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 05/29] IB/qib: Fix memory leak in qib_user_sdma_queue_pkts() Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 06/29] netfilter: fix regression in looped (broad|multi)casts MAC handling Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 07/29] qlcnic: potential dereference null pointer of rx_queue->page_ring Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 08/29] net: accept UFOv6 packages in virtio_net_hdr_to_skb Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 09/29] net: skip virtio_net_hdr_set_proto if protocol already set Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 10/29] bonding: fix ad_actor_system option setting to default Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 11/29] fjes: Check for error irq Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 12/29] drivers: net: smc911x: " Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 13/29] sfc: falcon: Check null pointer of rx_queue->page_ring Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 14/29] hwmon: (lm90) Fix usage of CONFIG2 register in detect function Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 15/29] ALSA: jack: Check the return value of kstrdup() Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 16/29] ALSA: drivers: opl3: Fix incorrect use of vp->state Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 17/29] Input: atmel_mxt_ts - fix double free in mxt_read_info_block Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 18/29] x86/pkey: Fix undefined behaviour with PKRU_WD_BIT Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 19/29] pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines Greg Kroah-Hartman
2021-12-27 15:27 ` Greg Kroah-Hartman [this message]
2021-12-27 15:27 ` [PATCH 4.14 21/29] f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr() Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 22/29] usb: gadget: u_ether: fix race in setting MAC address in setup phase Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 23/29] KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 24/29] Input: i8042 - enable deferred probe quirk for ASUS UM325UA Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 25/29] hwmon: (lm90) Do not report busy status bit as alarm Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 26/29] ax25: NPD bug when detaching AX25 device Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 27/29] hamradio: defer ax25 kfree after unregister_netdev Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 28/29] hamradio: improve the incomplete fix to avoid NPD Greg Kroah-Hartman
2021-12-27 15:27 ` [PATCH 4.14 29/29] phonet/pep: refuse to enable an unbound pipe Greg Kroah-Hartman
2021-12-28 11:27 ` [PATCH 4.14 00/29] 4.14.260-rc1 review Naresh Kamboju
2021-12-28 17:05 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211227151319.137346208@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=ardb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).