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 <ard.biesheuvel@linaro.org>,
Nicolas Pitre <nico@linaro.org>,
Russell King <rmk+kernel@arm.linux.org.uk>
Subject: [ 23/57] ARM: 7837/3: fix Thumb-2 bug in AES assembler code
Date: Wed, 2 Oct 2013 21:08:49 -0700 [thread overview]
Message-ID: <20131003040638.194800808@linuxfoundation.org> (raw)
In-Reply-To: <20131003040636.600441214@linuxfoundation.org>
3.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
commit 40190c85f427dcfdbab5dbef4ffd2510d649da1f upstream.
Patch 638591c enabled building the AES assembler code in Thumb2 mode.
However, this code used arithmetic involving PC rather than adr{l}
instructions to generate PC-relative references to the lookup tables,
and this needs to take into account the different PC offset when
running in Thumb mode.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm/crypto/aes-armv4.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/arch/arm/crypto/aes-armv4.S
+++ b/arch/arm/crypto/aes-armv4.S
@@ -148,7 +148,7 @@ AES_Te:
@ const AES_KEY *key) {
.align 5
ENTRY(AES_encrypt)
- sub r3,pc,#8 @ AES_encrypt
+ adr r3,AES_encrypt
stmdb sp!,{r1,r4-r12,lr}
mov r12,r0 @ inp
mov r11,r2
@@ -381,7 +381,7 @@ _armv4_AES_encrypt:
.align 5
ENTRY(private_AES_set_encrypt_key)
_armv4_AES_set_encrypt_key:
- sub r3,pc,#8 @ AES_set_encrypt_key
+ adr r3,_armv4_AES_set_encrypt_key
teq r0,#0
moveq r0,#-1
beq .Labrt
@@ -843,7 +843,7 @@ AES_Td:
@ const AES_KEY *key) {
.align 5
ENTRY(AES_decrypt)
- sub r3,pc,#8 @ AES_decrypt
+ adr r3,AES_decrypt
stmdb sp!,{r1,r4-r12,lr}
mov r12,r0 @ inp
mov r11,r2
next prev parent reply other threads:[~2013-10-03 4:08 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-03 4:08 [ 00/57] 3.11.4-stable review Greg Kroah-Hartman
2013-10-03 4:08 ` [ 01/57] block: Fix bio_copy_data() Greg Kroah-Hartman
2013-10-03 4:08 ` [ 02/57] sysv: Add forgotten superblock lock init for v7 fs Greg Kroah-Hartman
2013-10-03 4:08 ` [ 03/57] bcache: Fix a dumb journal discard bug Greg Kroah-Hartman
2013-10-03 4:08 ` [ 04/57] bcache: Strip endline when writing the label through sysfs Greg Kroah-Hartman
2013-10-03 4:08 ` [ 05/57] bcache: Fix for when no journal entries are found Greg Kroah-Hartman
2013-10-03 4:08 ` [ 06/57] bcache: Fix a writeback performance regression Greg Kroah-Hartman
2013-10-03 4:08 ` [ 07/57] bcache: Fix a flush/fua performance bug Greg Kroah-Hartman
2013-10-03 4:08 ` [ 08/57] bcache: Fix a dumb CPU spinning bug in writeback Greg Kroah-Hartman
2013-10-03 4:08 ` [ 09/57] bcache: Fix a shrinker deadlock Greg Kroah-Hartman
2013-10-03 4:08 ` [ 10/57] bcache: Fix for handling overlapping extents when reading in a btree node Greg Kroah-Hartman
2013-10-03 4:08 ` [ 11/57] bcache: Fix flushes in writeback mode Greg Kroah-Hartman
2013-10-03 4:08 ` [ 12/57] kernel/reboot.c: re-enable the function of variable reboot_default Greg Kroah-Hartman
2013-10-03 4:08 ` [ 13/57] x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically Greg Kroah-Hartman
2013-10-03 4:08 ` [ 14/57] tools lib lk: Uninclude linux/magic.h in debugfs.c Greg Kroah-Hartman
2013-10-03 4:08 ` [ 15/57] x86, efi: Dont map Boot Services on i386 Greg Kroah-Hartman
2013-10-03 4:08 ` [ 16/57] mei: make me client counters less error prone Greg Kroah-Hartman
2013-10-03 4:08 ` [ 17/57] mei: bus: stop wait for read during cl state transition Greg Kroah-Hartman
2013-10-03 4:08 ` [ 18/57] mei: cancel stall timers in mei_reset Greg Kroah-Hartman
2013-10-03 4:08 ` [ 19/57] tty: Fix SIGTTOU not sent with tcflush() Greg Kroah-Hartman
2013-10-03 4:08 ` [ 20/57] serial: tegra: fix tty-kref leak Greg Kroah-Hartman
2013-10-03 4:08 ` [ 21/57] serial: pch_uart: fix tty-kref leak in rx-error path Greg Kroah-Hartman
2013-10-03 4:08 ` [ 22/57] serial: pch_uart: fix tty-kref leak in dma-rx path Greg Kroah-Hartman
2013-10-03 4:08 ` Greg Kroah-Hartman [this message]
2013-10-03 4:08 ` [ 24/57] staging: vt6656: [BUG] main_usb.c oops on device_close move flag earlier Greg Kroah-Hartman
2013-10-03 4:08 ` [ 25/57] staging: vt6656: [BUG] iwctl_siwencodeext return if device not open Greg Kroah-Hartman
2013-10-03 4:08 ` [ 26/57] drm/i915/tv: clear adjusted_mode.flags Greg Kroah-Hartman
2013-10-03 4:08 ` [ 27/57] Revert "cw1200: Dont perform SPI transfers in interrupt context" Greg Kroah-Hartman
2013-10-03 4:08 ` [ 28/57] cw1200: Use a threaded oneshot irq handler for cw1200_spi Greg Kroah-Hartman
2013-10-03 4:08 ` [ 29/57] xhci: Ensure a command structure points to the correct trb on the command ring Greg Kroah-Hartman
2013-10-03 4:08 ` [ 30/57] xhci: Fix oops happening after address device timeout Greg Kroah-Hartman
2013-10-03 4:08 ` [ 31/57] USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd Greg Kroah-Hartman
2013-10-03 4:08 ` [ 32/57] xhci: Fix race between ep halt and URB cancellation Greg Kroah-Hartman
2013-10-03 4:08 ` [ 33/57] USB: OHCI: accept very late isochronous URBs Greg Kroah-Hartman
2013-10-03 4:09 ` [ 34/57] USB: UHCI: " Greg Kroah-Hartman
2013-10-03 4:09 ` [ 35/57] USB: Fix breakage in ffs_fs_mount() Greg Kroah-Hartman
2013-10-03 4:09 ` [ 36/57] fsl/usb: Resolve PHY_CLK_VLD instability issue for ULPI phy Greg Kroah-Hartman
2013-10-03 4:09 ` [ 37/57] usb: dwc3: pci: add support for BayTrail Greg Kroah-Hartman
2013-10-03 4:09 ` [ 38/57] usb: dwc3: add support for Merrifield Greg Kroah-Hartman
2013-10-03 4:09 ` [ 39/57] usb/core/devio.c: Dont reject control message to endpoint with wrong direction bit Greg Kroah-Hartman
2013-10-03 4:09 ` [ 40/57] driver core : Fix use after free of dev->parent in device_shutdown Greg Kroah-Hartman
2013-10-03 4:09 ` [ 41/57] dm snapshot: workaround for a false positive lockdep warning Greg Kroah-Hartman
2013-10-03 4:09 ` [ 42/57] dm-snapshot: fix performance degradation due to small hash size Greg Kroah-Hartman
2013-10-03 4:09 ` [ 43/57] dm mpath: disable WRITE SAME if it fails Greg Kroah-Hartman
2013-10-03 4:09 ` [ 44/57] drm/i915: preserve pipe A quirk in i9xx_set_pipeconf Greg Kroah-Hartman
2013-10-03 4:09 ` [ 45/57] drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER Greg Kroah-Hartman
2013-10-03 4:09 ` [ 46/57] drm/radeon/cik: Fix printing of client name on VM protection fault Greg Kroah-Hartman
2013-10-03 4:09 ` [ 47/57] drm/radeon/cik: Fix encoding of number of banks in tiling configuration info Greg Kroah-Hartman
2013-10-03 4:09 ` [ 48/57] drm/radeon/cik: fix overflow in vram fetch Greg Kroah-Hartman
2013-10-03 4:09 ` [ 49/57] drm/radeon: avoid UVD corruption on AGP cards using GPU gart Greg Kroah-Hartman
2013-10-03 4:09 ` [ 50/57] drm/radeon: Make r100_cp_ring_info() and radeon_ring_gfx() safe (v2) Greg Kroah-Hartman
2013-10-03 4:09 ` [ 51/57] drm/radeon: dont set default clocks for SI when DPM is disabled Greg Kroah-Hartman
2013-10-03 4:09 ` [ 52/57] drm/radeon: disable tests/benchmarks if accel " Greg Kroah-Hartman
2013-10-03 4:09 ` [ 53/57] drm/radeon: add missing hdmi callbacks for rv6xx Greg Kroah-Hartman
2013-10-03 4:09 ` [ 54/57] drm/radeon: fix hdmi audio on DCE3.0/3.1 asics Greg Kroah-Hartman
2013-10-03 4:09 ` [ 55/57] hwmon: (applesmc) Check key count before proceeding Greg Kroah-Hartman
2013-10-03 4:09 ` [ 56/57] ALSA: compress: Fix compress device unregister Greg Kroah-Hartman
2013-10-03 4:09 ` [ 57/57] irq: Always define devm_{request_threaded,free}_irq() Greg Kroah-Hartman
2013-10-03 13:35 ` [ 00/57] 3.11.4-stable review Guenter Roeck
2013-10-03 18:41 ` Greg Kroah-Hartman
2013-10-03 22:56 ` Shuah Khan
2013-10-03 23:03 ` Greg Kroah-Hartman
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=20131003040638.194800808@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nico@linaro.org \
--cc=rmk+kernel@arm.linux.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).