diff options
| author | Linus Torvalds | 2012-06-11 15:31:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-06-11 15:31:52 +0200 |
| commit | 4e3c8a1b1c63482403e9d5e3148dee1a711e4b91 (patch) | |
| tree | 513410a63a617436c94373fa5cf6273c3a85c47c | |
| parent | Merge tag 'regmap-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| parent | crypto: aesni-intel - fix unaligned cbc decrypt for x86-32 (diff) | |
| download | kernel-qcow2-linux-4e3c8a1b1c63482403e9d5e3148dee1a711e4b91.tar.gz kernel-qcow2-linux-4e3c8a1b1c63482403e9d5e3148dee1a711e4b91.tar.xz kernel-qcow2-linux-4e3c8a1b1c63482403e9d5e3148dee1a711e4b91.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes an unaligned fault on x86-32 with aesni-intel and an
RNG failure with atmel-rng (repeated bits)."
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni-intel - fix unaligned cbc decrypt for x86-32
hwrng: atmel-rng - fix race condition leading to repeated bits
| -rw-r--r-- | arch/x86/crypto/aesni-intel_asm.S | 6 | ||||
| -rw-r--r-- | drivers/char/hw_random/atmel-rng.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index be6d9e365a80..3470624d7835 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -2460,10 +2460,12 @@ ENTRY(aesni_cbc_dec) pxor IN3, STATE4 movaps IN4, IV #else - pxor (INP), STATE2 - pxor 0x10(INP), STATE3 pxor IN1, STATE4 movaps IN2, IV + movups (INP), IN1 + pxor IN1, STATE2 + movups 0x10(INP), IN2 + pxor IN2, STATE3 #endif movups STATE1, (OUTP) movups STATE2, 0x10(OUTP) diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c index f518b99f53f5..6289f0eee24c 100644 --- a/drivers/char/hw_random/atmel-rng.c +++ b/drivers/char/hw_random/atmel-rng.c @@ -36,6 +36,13 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, /* data ready? */ if (readl(trng->base + TRNG_ODATA) & 1) { *data = readl(trng->base + TRNG_ODATA); + /* + ensure data ready is only set again AFTER the next data + word is ready in case it got set between checking ISR + and reading ODATA, so we don't risk re-reading the + same word + */ + readl(trng->base + TRNG_ISR); return 4; } else return 0; |