diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-07-15 07:41:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-15 07:41:31 -0700 |
| commit | 9d853c3757ef74ded5ae564d68370f22208fb88b (patch) | |
| tree | aaf87a1a75d7e1c449e058867a1c4883dcc34838 /crypto | |
| parent | ba460e48064edeb57e3398eb8972c58de33f11ea (diff) | |
| download | kernel_samsung_tuna-9d853c3757ef74ded5ae564d68370f22208fb88b.zip kernel_samsung_tuna-9d853c3757ef74ded5ae564d68370f22208fb88b.tar.gz kernel_samsung_tuna-9d853c3757ef74ded5ae564d68370f22208fb88b.tar.bz2 | |
[CRYPTO]: Fix zero-extension bug on 64-bit architectures.
Noticed by Ken-ichirou MATSUZAWA.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cipher.c | 6 | ||||
| -rw-r--r-- | crypto/internal.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cipher.c b/crypto/cipher.c index 1c92c6b..8da6443 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -41,7 +41,7 @@ static unsigned int crypt_slow(const struct cipher_desc *desc, struct scatter_walk *in, struct scatter_walk *out, unsigned int bsize) { - unsigned int alignmask = crypto_tfm_alg_alignmask(desc->tfm); + unsigned long alignmask = crypto_tfm_alg_alignmask(desc->tfm); u8 buffer[bsize * 2 + alignmask]; u8 *src = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); u8 *dst = src + bsize; @@ -160,7 +160,7 @@ static int crypt_iv_unaligned(struct cipher_desc *desc, unsigned int nbytes) { struct crypto_tfm *tfm = desc->tfm; - unsigned int alignmask = crypto_tfm_alg_alignmask(tfm); + unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); u8 *iv = desc->info; if (unlikely(((unsigned long)iv & alignmask))) { @@ -424,7 +424,7 @@ int crypto_init_cipher_ops(struct crypto_tfm *tfm) } if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) { - unsigned int align; + unsigned long align; unsigned long addr; switch (crypto_tfm_alg_blocksize(tfm)) { diff --git a/crypto/internal.h b/crypto/internal.h index 6861287..37515be 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -75,7 +75,7 @@ static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg, switch (flags & CRYPTO_TFM_MODE_MASK) { case CRYPTO_TFM_MODE_CBC: - len = ALIGN(len, alg->cra_alignmask + 1); + len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1); len += alg->cra_blocksize; break; } |