Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 827c3911 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fa9b98fd

crypto/cipher.c

+3 −2
Original line number Diff line number Diff line
@@ -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;