[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>

diff --git a/crypto/cipher.c b/crypto/cipher.c
index 1c92c6bb138bd2c74d50fcf595e0402a98436bdc..8da644364cb4225824575ec4813741b9d46d7041 100644 (file)
--- 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)
 {
                               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;
        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 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))) {
        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) {
        }
        
        if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) {

-               unsigned int align;
+               unsigned long align;

                unsigned long addr;
                
                switch (crypto_tfm_alg_blocksize(tfm)) {
                unsigned long addr;
                
                switch (crypto_tfm_alg_blocksize(tfm)) {

diff --git a/crypto/internal.h b/crypto/internal.h
index 68612874b5fde627e571b67ce1533084055e6104..37515beafc8ce44ff501d15d617968248656b59f 100644 (file)
--- 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:
        
        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;
        }
                len += alg->cra_blocksize;
                break;
        }