diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-10 16:09:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-10 16:09:34 -0800 |
| commit | 88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d (patch) | |
| tree | c03d8917ea8253c118bec12949c34595d7311bcd | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | [CRYPTO] padlock: Fix alignment fault in aes_crypt_copy (diff) | |
| download | linux-dev-88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d.tar.xz linux-dev-88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] padlock: Fix alignment fault in aes_crypt_copy
| -rw-r--r-- | drivers/crypto/padlock-aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index a337b693b6c9..5f7e71810489 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c @@ -429,8 +429,8 @@ static inline void padlock_xcrypt(const u8 *input, u8 *output, void *key, static void aes_crypt_copy(const u8 *in, u8 *out, u32 *key, struct cword *cword) { - u8 tmp[AES_BLOCK_SIZE * 2] - __attribute__ ((__aligned__(PADLOCK_ALIGNMENT))); + u8 buf[AES_BLOCK_SIZE * 2 + PADLOCK_ALIGNMENT - 1]; + u8 *tmp = PTR_ALIGN(&buf[0], PADLOCK_ALIGNMENT); memcpy(tmp, in, AES_BLOCK_SIZE); padlock_xcrypt(tmp, out, key, cword); |