]> err.no Git - linux-2.6/commitdiff
[CRYPTO] cipher: Align temporary buffer in cbc_process_decrypt
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 29 Nov 2005 11:04:41 +0000 (22:04 +1100)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 9 Jan 2006 22:15:49 +0000 (14:15 -0800)
Since the temporary buffer is used as an argument to cia_decrypt, it must be
aligned by cra_alignmask.  This bug was found by linux@horizon.com.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/cipher.c

index dfd4bcfc59758332d8ae82fc1d0db2e009c9b26a..65bcea0cd17c867ae88dde90aefc9e137ebd3259 100644 (file)
@@ -212,9 +212,10 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
        struct crypto_tfm *tfm = desc->tfm;
        void (*xor)(u8 *, const u8 *) = tfm->crt_u.cipher.cit_xor_block;
        int bsize = crypto_tfm_alg_blocksize(tfm);
+       unsigned long alignmask = crypto_tfm_alg_alignmask(desc->tfm);
 
-       u8 stack[src == dst ? bsize : 0];
-       u8 *buf = stack;
+       u8 stack[src == dst ? bsize + alignmask : 0];
+       u8 *buf = (u8 *)ALIGN((unsigned long)stack, alignmask + 1);
        u8 **dst_p = src == dst ? &buf : &dst;
 
        void (*fn)(void *, u8 *, const u8 *) = desc->crfn;