diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:33:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:33:19 -0800 |
| commit | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (patch) | |
| tree | 80ca10a1ad9dc572e131a56a93fcf0c63c14d168 /crypto/api.c | |
| parent | 3d1f337b3e7378923c89f37afb573a918ef40be5 (diff) | |
| parent | 55e9dce37ddf3ab358ba1d1e9eef4ee4bd8174a6 (diff) | |
| download | kernel-crypto-ec1248e70edc5cf7b485efcc7b41e44e10f422e5.tar.gz kernel-crypto-ec1248e70edc5cf7b485efcc7b41e44e10f422e5.tar.xz kernel-crypto-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 'crypto/api.c')
| -rw-r--r-- | crypto/api.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/api.c b/crypto/api.c index e26156f7183..80bba637fba 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -165,7 +165,7 @@ static unsigned int crypto_ctxsize(struct crypto_alg *alg, int flags) break; } - return len + alg->cra_alignmask; + return len + (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1)); } struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) @@ -179,12 +179,10 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) goto out; tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags); - tfm = kmalloc(tfm_size, GFP_KERNEL); + tfm = kzalloc(tfm_size, GFP_KERNEL); if (tfm == NULL) goto out_put; - memset(tfm, 0, tfm_size); - tfm->__crt_alg = alg; if (crypto_init_flags(tfm, flags)) |