diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 18:33:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 18:33:19 +0100 |
| commit | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (patch) | |
| tree | 80ca10a1ad9dc572e131a56a93fcf0c63c14d168 /drivers | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [CRYPTO] aes: Fixed array boundary violation (diff) | |
| download | linux-ec1248e70edc5cf7b485efcc7b41e44e10f422e5.tar.xz linux-ec1248e70edc5cf7b485efcc7b41e44e10f422e5.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] aes: Fixed array boundary violation
[CRYPTO] tcrypt: Fix key alignment
[CRYPTO] all: Add missing cra_alignmask
[CRYPTO] all: Use kzalloc where possible
[CRYPTO] api: Align tfm context as wide as possible
[CRYPTO] twofish: Use rol32/ror32 where appropriate
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/padlock-aes.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 0c08c58252be..5158a9db4bc5 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c @@ -284,7 +284,11 @@ aes_hw_extkey_available(uint8_t key_len) static inline struct aes_ctx *aes_ctx(void *ctx) { - return (struct aes_ctx *)ALIGN((unsigned long)ctx, PADLOCK_ALIGNMENT); + unsigned long align = PADLOCK_ALIGNMENT; + + if (align <= crypto_tfm_ctx_alignment()) + align = 1; + return (struct aes_ctx *)ALIGN((unsigned long)ctx, align); } static int |