From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 2 Sep 2006 22:58:41 +0000 (+1000)
Subject: [BLOCK] dm-crypt: Align IV to u64 for essiv
X-Git-Tag: v2.6.20-rc1~145^2^2~7^2~40
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=45789328e5aa2de96d4467e4445418364e5378d7;p=linux-2.6-omap-h63xx.git

[BLOCK] dm-crypt: Align IV to u64 for essiv

This patch makes the IV u64-aligned since essiv does a u64 store to it.

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

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 6dbaeee48ce..facf859b9b8 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -272,7 +272,7 @@ crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
                           struct scatterlist *in, unsigned int length,
                           int write, sector_t sector)
 {
-	u8 iv[cc->iv_size];
+	u8 iv[cc->iv_size] __attribute__ ((aligned(__alignof__(u64))));
 	struct blkcipher_desc desc = {
 		.tfm = cc->tfm,
 		.info = iv,