From: Herbert Xu Date: Tue, 29 Nov 2005 11:04:41 +0000 (+1100) Subject: [CRYPTO] cipher: Align temporary buffer in cbc_process_decrypt X-Git-Tag: v2.6.16-rc1~658^2~21 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=827c3911d8551842900f44c9a139382bcae68e6e;p=linux-2.6-omap-h63xx.git [CRYPTO] cipher: Align temporary buffer in cbc_process_decrypt 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 --- diff --git a/crypto/cipher.c b/crypto/cipher.c index dfd4bcfc597..65bcea0cd17 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -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;